Changeset 1468 for trunk/server

Timestamp:

Feb 17, 2010, 11:44:13 AM (15 years ago)

Author:

gdb

Message:

Fixed the exception type problem in this code; fixed up remove-servers.

File:

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

trunk/server/common/oursrc/hacron/hacron

@@ -27 +27 @@
 
 class HacronError(Exception):
-    def __init__(self, errno, msg='Something went wrong'):
-        self.errno = errno
+    def __init__(self, ocf_errno, msg='Something went wrong'):
+        self.ocf_errno = ocf_errno
         self.msg = msg
         logger.error(msg)
@@ -83 +83 @@
 def _remove(dest):
     if not path.exists(dest) and not path.islink(dest):
-        logger.info('Tried to remove nonexistant path %s' % dest)
+        logger.error('Tried to remove nonexistant path %s' % dest)
         return True
 
@@ -142 +142 @@
 
 def start_cron(args, options):
-    if not _touch(_serverfile(HOSTNAME)):
+    serverfile = _serverfile(HOSTNAME)
+    if not _touch(serverfile):
+        logger.error('Could not touch %s' % serverfile)
         return OCF_ERR_CONFIGURED
     elif _is_master(HOSTNAME):
@@ -167 +169 @@
     try:
         _restart_crond(args, options)
-    except OSError, e:
-        return e.errno
+    except HacronException, e:
+        return e.ocf_errno
     return OCF_SUCCESS
 
@@ -184 +186 @@
         try:
             _restart_crond(args, options)
-        except OSError, e:
-            return e.errno
+        except HacronException, e:
+            return e.ocf_errno
         return OCF_SUCCESS
 
@@ -199 +201 @@
     if not _touch(_serverfile(HOSTNAME)):
         logger.error('Could not touch %s' % _serverfile(HOSTNAME))
-        return OCF_GENERIC_ERR
+        return OCF_ERR_GENERIC
     elif not path.exists(CRONSPOOL_DIR):
-        return OCF_GENERIC_ERR
+        return OCF_ERR_GENERIC
     else:
         return OCF_SUCCESS
@@ -216 +218 @@
     """Remove servers from the list of available ones."""
     for server in servers:
-        os.unlink(_serverfile(server))
+        _remove(_serverfile(server))
+        _remove(_crondir(server))
+        logger.info('Removed %s from list of available ones' % server)
+
 
 def meta_data_cron(args, options):
@@ -325 +330 @@
         _set_globals(args, options)
     except HacronError, e:
-        return e.errno
+        return e.ocf_errno
 
     with lock('%s/hacron-%s.lock' % (HA_RSCTMP, OCF_RESOURCE_INSTANCE)):