Updated Branches: refs/heads/4.3 8a29b7000 -> 0d682fb2f
Monitoring python script removed semicolon Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0d682fb2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0d682fb2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0d682fb2 Branch: refs/heads/4.3 Commit: 0d682fb2faec8ba18b6df5ac7f2a32432cc99207 Parents: 8a29b70 Author: Jayapal <[email protected]> Authored: Tue Nov 26 11:24:37 2013 +0530 Committer: Jayapal <[email protected]> Committed: Tue Nov 26 11:26:19 2013 +0530 ---------------------------------------------------------------------- systemvm/patches/debian/config/root/monitorServices.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0d682fb2/systemvm/patches/debian/config/root/monitorServices.py ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/root/monitorServices.py b/systemvm/patches/debian/config/root/monitorServices.py index 3646c81..0319ece 100755 --- a/systemvm/patches/debian/config/root/monitorServices.py +++ b/systemvm/patches/debian/config/root/monitorServices.py @@ -156,11 +156,11 @@ def checkProcessRunningStatus(process_name, pidFile): #if not matched set pidFileMatched=False printd("Checking pid file") if isPidMatchPidFile(pidFile, pids) == StatusCodes.SUCCESS: - return True,pids; + return True,pids printd("pid of exit status %s" %exitStatus) - return False,pids; + return False,pids def restartService(service_name): @@ -224,7 +224,7 @@ def checkProcessStatus( process ): if service_name == 'apache2': # Killing apache2 process with this the main service will not start for pid in pids: - cmd = 'kill -9 '+pid; + cmd = 'kill -9 '+pid printd(cmd) Popen(cmd, shell=True, stdout=PIPE, stderr=STDOUT) @@ -331,9 +331,9 @@ def loadPsFromUnMonitFile(): for i in plist: dict_unmonit[i.split(':')[0]] = i.split(':')[1] - fd.close(); + fd.close() - return dict_unmonit; + return dict_unmonit def writePsListToUnmonitFile(umonit_update): @@ -348,7 +348,7 @@ def writePsListToUnmonitFile(umonit_update): printd("Failed to open file %s " %Config.UNMONIT_PS_FILE) return StatusCodes.FAILED - fd.write(line); + fd.write(line) fd.close()
