playground/onur/redis - Fix service status

[Onur Küçük]

Author: onur
Date: Wed Mar 21 16:04:38 2012
New Revision: 125646

Modified:
   playground/onur/redis/comar/service.py
   playground/onur/redis/files/redis.confd
Log:
Fix service status

---
 comar/service.py  |   18 ++++++++----------
 files/redis.confd |    2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

Modified: playground/onur/redis/comar/service.py
=================================================================
--- playground/onur/redis/comar/service.py	(original)
+++ playground/onur/redis/comar/service.py	Wed Mar 21 16:04:38 2012
@@ -5,20 +5,24 @@
 serviceConf = "redis"
 serviceDefault = "off"
 
-serviceDesc = _({"en": "Redis",
-                 "tr": "Redis"})
+serviceDesc = _({"en": "Redis Server",
+                 "tr": "Redis Sunucu"})
 
 EXEC = "/usr/sbin/redis-server"
 REDIS_PID = config.get("REDIS_PID", "/var/run/redis/redis.pid")
 REDIS_USER = config.get("REDIS_USER", "redis")
 REDIS_GROUP = config.get("REDIS_GROUP", "redis")
+REDIS_CONF = config.get("REDIS_CONF", "/etc/redis.conf")
+REDIS_OPTS = config.get("REDIS_OPTS", "redis")
 
 @synchronized
 def start():
     startService(command=EXEC,
-                 args = config.get("REDIS_OPTS", "/etc/redis.conf"),
+                 args = "%s %s" % (REDIS_CONF, REDIS_OPTS),
                  pidfile = REDIS_PID,
                  chuid = REDIS_USER,
+                 detach = True,
+                 makepid = True,
                  donotify = True)
 
 @synchronized
@@ -27,12 +31,6 @@
                  chuid = REDIS_USER,
                  donotify = True)
 
-def ready():
-    import os
-    status = is_on()
-    if status == "on" or (status == "conditional" and os.path.exists("/sys/coffee/ready")):
-        start()
-
 def status():
-    return checkDaemon(REDIS_PID)
+    return isServiceRunning(REDIS_PID)
 

Modified: playground/onur/redis/files/redis.confd
=================================================================
--- playground/onur/redis/files/redis.confd	(original)
+++ playground/onur/redis/files/redis.confd	Wed Mar 21 16:04:38 2012
@@ -17,5 +17,5 @@
 
 # Redis options.
 # (Redis expects the first argument to be the configuration file.)
-REDIS_OPTS="${REDIS_CONF}"
+REDIS_OPTS=""