Changeset 1467 for trunk/server

Timestamp:

Feb 13, 2010, 5:36:36 PM (15 years ago)

Author:

gdb

Message:

Minor hacron fixes

File:

• trunk/server/common/oursrc/hacron/hacron (modified) (8 diffs)

trunk/server/common/oursrc/hacron/hacron

@@ -1 +1 @@
 #!/usr/bin/env python
+from __future__ import with_statement
 import glob
 import logging.handlers
@@ -29 +30 @@
         self.errno = errno
         self.msg = msg
+        logger.error(msg)
     
 class HaLogHandler(logging.Handler):
@@ -80 +82 @@
 
 def _remove(dest):
+    if not path.exists(dest) and not path.islink(dest):
+        logger.info('Tried to remove nonexistant path %s' % dest)
+        return True
+
     try:
         if path.isdir(dest):
@@ -128 +134 @@
     else:
         cmd = ['service', 'crond', 'reload']
-    subprocess.check_call(cmd)
+    try:
+        subprocess.check_call(cmd)
+    except OSError, e:
+        raise HacronError(OCF_ERR_GENERIC, 'Cron restart exited with return code %d' % e.errno)
+    else:
+        logger.info('Restarted crond')
 
 def start_cron(args, options):
@@ -155 +166 @@
                 logger.info('Created slave dummy directory %s' % crondir)
     try:
-        _restart_crond()
+        _restart_crond(args, options)
     except OSError, e:
-        logger.error('Cron restart exited with return code %d' % e.errno)
-        return OCF_ERR_GENERIC
-    else:
-        logger.info('Restarted crond')
+        return e.errno
     return OCF_SUCCESS
 
@@ -175 +183 @@
         # TODO: should we do something else here?
         try:
-            _restart_crond()
+            _restart_crond(args, options)
         except OSError, e:
-            logger.error('Cron restart exited with return code %d' % e.errno)
-            return OCF_ERR_GENERIC
-        else:
-            logger.info('Restarted crond')
+            return e.errno
         return OCF_SUCCESS
 
@@ -276 +281 @@
 
 def main():
-    usage_str = """usage: %%prog [-s server] [-c cronroot] [-d] cmd
+    usage_str = """usage: %prog [-s server] [-c cronroot] [-d] cmd
 
 Script for starting and stopping cron in a multiserver environment.
@@ -320 +325 @@
         _set_globals(args, options)
     except HacronError, e:
-        logger.error(e.msg)
         return e.errno