[Engine-patches] Change in ovirt-engine[master]: packaging: enigne-service: cleanup to ease reuse

[Alon Bar-Lev]

Alon Bar-Lev has uploaded a new change for review.

Change subject: packaging: enigne-service: cleanup to ease reuse
......................................................................

packaging: enigne-service: cleanup to ease reuse

Change-Id: I755f550f6992851fd70e03afa1db008d6b42d9d4
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M packaging/services/ovirt-engine.py
M packaging/services/ovirt-engine.systemd.in
M packaging/services/ovirt-engine.sysv.in
3 files changed, 15 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/72/14372/1

diff --git a/packaging/services/ovirt-engine.py 
b/packaging/services/ovirt-engine.py
index d9d2f1d..4fc72d2 100755
--- a/packaging/services/ovirt-engine.py
+++ b/packaging/services/ovirt-engine.py
@@ -29,13 +29,10 @@
 import service
 
 
-class EngineDaemon(service.Daemon):
-    """
-    The engine daemon
-    """
+class Daemon(service.Daemon):
 
     def __init__(self):
-        super(EngineDaemon, self).__init__()
+        super(Daemon, self).__init__()
 
     def _processTemplate(self, template, dir):
         out = os.path.join(
@@ -237,7 +234,7 @@
         if not os.path.exists(config.ENGINE_DEFAULT_FILE):
             raise RuntimeError(
                 _(
-                    "The engine configuration defaults file '{file}' "
+                    "The configuration defaults file '{file}' "
                     "required but missing"
                 ).format(
                     file=config.ENGINE_DEFAULT_FILE,
@@ -412,14 +409,14 @@
         })
 
     def daemonStdHandles(self):
-        engineConsoleLog = open(
+        consoleLog = open(
             os.path.join(
                 self._config.getString('ENGINE_LOG'),
                 'console.log'
             ),
             'w+',
         )
-        return (engineConsoleLog, engineConsoleLog)
+        return (consoleLog, consoleLog)
 
     def daemonContext(self):
         self.daemonAsExternalProcess(
@@ -440,7 +437,7 @@
 
 if __name__ == '__main__':
     service.setupLogger()
-    d = EngineDaemon()
+    d = Daemon()
     d.run()
 
 
diff --git a/packaging/services/ovirt-engine.systemd.in 
b/packaging/services/ovirt-engine.systemd.in
index 73884d2..5202abc 100644
--- a/packaging/services/ovirt-engine.systemd.in
+++ b/packaging/services/ovirt-engine.systemd.in
@@ -7,7 +7,7 @@
 User=@ENGINE_USER@
 Group=@ENGINE_GROUP@
 LimitNOFILE=65535
-ExecStart=/usr/share/ovirt-engine/services/ovirt-engine.py 
$OVIRT_ENGINE_EXTRA_ARGS start
+ExecStart=@ENGINE_USR@/services/ovirt-engine.py $EXTRA_ARGS start
 EnvironmentFile=-/etc/sysconfig/ovirt-engine
 
 [Install]
diff --git a/packaging/services/ovirt-engine.sysv.in 
b/packaging/services/ovirt-engine.sysv.in
index 0a74e38..51410c9 100644
--- a/packaging/services/ovirt-engine.sysv.in
+++ b/packaging/services/ovirt-engine.sysv.in
@@ -14,12 +14,14 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-[ -f /etc/sysconfig/ovirt-engine ] && . /etc/sysconfig/ovirt-engine
+NAME="ovirt-engine"
+PROG="oVirt Engine"
+
+[ -f "/etc/sysconfig/${NAME}" ] && . "/etc/sysconfig/${NAME}"
 
 RETVAL=0
-PROG="oVirt Engine"
-LOCKFILE="/var/lock/subsys/ovirt-engine"
-PIDFILE="${PIDFILE:-/var/run/ovirt-engine.pid}"
+LOCKFILE="/var/lock/subsys/${NAME}"
+PIDFILE="${PIDFILE:-/var/run/${NAME}.pid}"
 USER="@ENGINE_USER@"
 
 # See how we were called.
@@ -34,10 +36,10 @@
                touch "${PIDFILE}"
                chown "${USER}" "${PIDFILE}"
                daemon --user "${USER}" --pidfile="${PIDFILE}" \
-                       /usr/share/ovirt-engine/services/ovirt-engine.py \
+                       "${ENGINE_USR}/services/${NAME}.py" \
                                --pidfile="${PIDFILE}" \
                                --background \
-                               ${OVIRT_ENGINE_EXTRA_ARGS} \
+                               ${EXTRA_ARGS} \
                                start
                RETVAL=$?
                echo


--
To view, visit http://gerrit.ovirt.org/14372
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I755f550f6992851fd70e03afa1db008d6b42d9d4
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches