Merge pull request #233 from angelabriel/maintenance-classic

fix load error of susChkSrv.py

Author: angelabriel

srHook/susChkSrv.py

@@ -73,7 +73,7 @@ def __init__(self, *args, **kwargs):
             super(susChkSrv, self).__init__(*args, **kwargs)
             method = "init"
             episode = getEpisode()
-            self.logTimestamp(self, method, episode, "init called")
+            self.logTimestamp(method, episode, "init called")
 
             # read settings from global.ini
             # read sustkover_timeout
@@ -87,12 +87,12 @@ def __init__(self, *args, **kwargs):
                 isValidAction = (self.action_on_lost in ["ignore", "fence", "kill", "stop", "firstStopThenKill"])
                 if not isValidAction:
                     msg = "Invalid action_on_lost {}. Fallback to 'ignore'".format(self.action_on_lost)
-                    self.logTimestamp(self, method, episode, msg)
+                    self.logTimestamp(method, episode, msg)
                     self.tracer.info(msg)
                     self.action_on_lost = "ignore_fallback"
             else:
                 msg = "action_on_lost not configured. Fallback to 'ignore'"
-                self.logTimestamp(self, method, episode, msg)
+                self.logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
                 self.action_on_lost = "ignore_default"
             if self.config.hasKey("kill_signal"):
@@ -101,7 +101,7 @@ def __init__(self, *args, **kwargs):
                 self.killSignal = "9"
             # TODO: logging the signal parameter, but only if it is the kill action
             msg = "{}.{}() version {}, parameter info: action_on_lost={} stop_timeout={} kill_signal={}".format(self.__class__.__name__, method, SRHookVersion, self.action_on_lost, self.stop_timeout, self.killSignal)
-            self.logTimestamp(self, method, episode, msg)
+            self.logTimestamp(method, episode, msg)
             self.tracer.info(msg)
             # TODO: use action specific init messages (e.g. for stop also report stop_timeout)
             self.takeover_active = False
@@ -133,9 +133,9 @@ def srServiceStateChanged(self, ParamDict, **kwargs):
             msg1 = "{0} version {1}. Method {2} method called.".format(SRHookName, SRHookVersion, method)
             msg2 = "{0} {1} method called with Dict={2}".format(SRHookName, method, ParamDict)
             msg3 = "{0} {1} method called with SAPSYSTEMNAME={2}".format(SRHookName, method, mySID)
-            self.logTimestamp(self, method, episode, msg1)
-            self.logTimestamp(self, method, episode, msg2)
-            self.logTimestamp(self, method, episode, msg3)
+            self.logTimestamp(method, episode, msg1)
+            self.logTimestamp(method, episode, msg2)
+            self.logTimestamp(method, episode, msg3)
             self.tracer.info(msg1)
             self.tracer.info(msg2)
             self.tracer.info(msg3)
@@ -153,7 +153,7 @@ def srServiceStateChanged(self, ParamDict, **kwargs):
 
             # log service_name, service_port, service_status, service_previous_status,    database_id, database_name, database_status,    daemon_status
             msg = "srv:{0}-{1}-{2}-{3} db:{4}-{5}-{6} daem:{7}".format(service, port, status, previousStatus, databaseName, databaseId, databaseStatus, daemonStatus)
-            self.logTimestamp(self, method, episode, msg)
+            self.logTimestamp(method, episode, msg)
             self.tracer.info(msg)
 
             # analysis, if the event looks like an dying indexserver (LOST)
@@ -177,54 +177,54 @@ def srServiceStateChanged(self, ParamDict, **kwargs):
             #
             if (isIndexserver and serviceRestart and daemonActive and databaseActive):
                 msg = "LOST: indexserver event looks like a lost indexserver (status={})".format(status)
-                self.logTimestamp(self, method, episode, msg)
+                self.logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
                 isLostIndexserver = True
                 eventKnown = True
             if (isIndexserver and serviceActive and daemonActive and databaseActive):
                 if self.takeover_active:
                     msg = "TAKEOVER: indexserver event looks like a takeover event"
-                    self.logTimestamp(self, method, episode, msg)
+                    self.logTimestamp(method, episode, msg)
                     self.tracer.info(msg)
                 else:
                     msg = "LOST: indexserver event looks like a lost indexserver (indexserver started)"
-                    self.logTimestamp(self, method, episode, msg)
+                    self.logTimestamp(method, episode, msg)
                     self.tracer.info(msg)
                 eventKnown = True
                 # TODO: this event (LOST/started) seems also to come, if a sr_takeover is been processed (using preTakeover() and postTakeover() to mark this event?)
             if (isIndexserver and serviceStopping and daemonStop):
                 msg = "STOP: indexserver event looks like graceful instance stop"
-                self.logTimestamp(self, method, episode, msg)
+                self.logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
                 eventKnown = True
             if (isIndexserver and serviceDown and daemonStop):
                 msg = "STOP: indexserver event looks like graceful instance stop (indexserver stopped)"
                 self.tracer.info(msg)
-                self.logTimestamp(self, method, episode, msg)
+                self.logTimestamp(method, episode, msg)
                 eventKnown = True
             if (isIndexserver and serviceStopping and daemonActive and databaseStop):
                 msg = "STOP: indexserver event looks like graceful tenant stop"
-                self.logTimestamp(self, method, episode, msg)
+                self.logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
                 eventKnown = True
             if (isIndexserver and serviceDown and daemonActive and databaseStop):
                 msg = "STOP: indexserver event looks like graceful tenant stop (indexserver stopped)"
-                self.logTimestamp(self, method, episode, msg)
+                self.logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
                 eventKnown = True
             if (isIndexserver and serviceRestart and daemonStarting and databaseActive):
                 msg = "START: indexserver event looks like graceful tenant start"
-                self.logTimestamp(self, method, episode, msg)
+                self.logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
                 eventKnown = True
             if (isIndexserver and serviceActive and daemonStarting and databaseActive):
                 msg = "START: indexserver event looks like graceful tenant start (indexserver started)"
-                self.logTimestamp(self, method, episode, msg)
+                self.logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
                 eventKnown = True
             if (isIndexserver and not eventKnown):
                 msg = "DBG: version={},serviceRestart={}, serviceStop={}, serviceDown={}, daemonActive={}, daemonStop={}, daemonStarting={}, databaseActive={}, databaseStop={}".format(SRHookVersion, serviceRestart, serviceStop, serviceDown, daemonActive, daemonStop, daemonStarting, databaseActive, databaseStop)
-                self.logTimestamp(self, method, episode, msg)
+                self.logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
             # event on secondary, if HA1 tenant is stopped on primary
             # DBG: version=0.2.7,serviceRestart=True, serviceStop=True, serviceDown=False, daemonActive=True, daemonStop=False, daemonStarting=False, databaseActive=False, databaseStop=False
@@ -235,31 +235,31 @@ def srServiceStateChanged(self, ParamDict, **kwargs):
             #
             if (isLostIndexserver and (self.action_on_lost in ["ignore", "ignore_fallback", "ignore_default"])):
                 msg = "LOST: event ignored. action_on_lost={}".format(self.action_on_lost)
-                self.logTimestamp(self, method, episode, msg)
+                self.logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
             if (isLostIndexserver and self.action_on_lost == "fence"):
                 msg = "LOST: fence node. action_on_lost={}".format(self.action_on_lost)
-                self.logTimestamp(self, method, episode, msg)
+                self.logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
                 tout_cmd = ""
                 action_cmd = "sudo /usr/sbin/SAPHanaSR-hookHelper --sid={0} --case=fenceMe".format(mySID)
                 cmdrc = os.WEXITSTATUS(os.system("sleep {}; {} {}".format("5", tout_cmd, action_cmd)))
                 # DONE add fence code here
             if (isLostIndexserver and self.action_on_lost == "kill"):
                 msg = "LOST: kill instance. action_on_lost={} signal={}".format(self.action_on_lost, self.killSignal)
-                self.logTimestamp(self, method, episode, msg)
+                self.logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
                 tout_cmd = ""
                 action_cmd = "HDB kill-{}".format(self.killSignal)
                 # doing a short sleep before killing all SAP HANA processes to allow nameserver to write the already sent log messages
                 cmdrc = os.WEXITSTATUS(os.system("sleep {}; {} {}".format("5", tout_cmd, action_cmd)))
                 # the following message will most-likely also be lost, if we use signal 9
                 msg = "LOST: killed instance. action_on_lost={}".format(self.action_on_lost)
-                self.logTimestamp(self, method, episode, msg)
+                self.logTimestamp(method, episode, msg)
                 # DONE: hardcoded 5 here to be moved to a self.sleep_before_action (or however it will be named)
             if (isLostIndexserver and self.action_on_lost == "stop"):
                 msg = "LOST: stop instance. action_on_lost={}".format(self.action_on_lost)
-                self.logTimestamp(self, method, episode, msg)
+                self.logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
                 tout_cmd = "timeout {}".format(self.stop_timeout)
                 # action_cmd = "HDB stop"
@@ -271,7 +271,7 @@ def srServiceStateChanged(self, ParamDict, **kwargs):
                 # this code could be removed at any time without notice
                 # the code does not promise that it will be part of any product later
                 msg = "LOST: firstStopThenKill instance. action_on_lost={}".format(self.action_on_lost)
-                self.logTimestamp(self, method, episode, msg)
+                self.logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
                 action_cmd = "/usr/sbin/SAPHanaSR-hookHelper --sid={} --ino={} --case=firstStopThenKill".format(mySID, self.ino)
                 cmdrc = os.WEXITSTATUS(os.system("sleep {}; {}".format("5", action_cmd)))
@@ -280,7 +280,7 @@ def srServiceStateChanged(self, ParamDict, **kwargs):
                 # this code could be removed at any time without notice
                 # the code does not promise that it will be part of any product later
                 msg = "LOST: set cluster attribute. action_on_lost={} is currently not implemented".format(self.action_on_lost)
-                self.logTimestamp(self, method, episode, msg)
+                self.logTimestamp(method, episode, msg)
                 self.tracer.info(msg)
                 # TODO add attribute code here
             return 0