add opsmod log and if or not

honglongwei · honglongwei · commit 1f7bb07edaf5 · 2016-04-29T15:02:14.000+08:00
diff --git a/opsmod.py b/opsmod.py
@@ -8,30 +8,54 @@
 import time
 import zipfile
 import datetime
+import getpass
+import logging 
 import subprocess
 from subprocess import Popen
  
  
 #src update package path
-src_path = '/tmp/backup'
+src_path = '/home/mrdTomcat/update'
+ 
 #des update package path
-des_path = {'tomcat': '/tmp/222',
-            'apache': '/tmp',
-            'websocket': '/tmp'}
+des_path = {'webap': '/home/app/webap/tomcat/webapps',
+            'apache': '/usr/local/apache',
+            'websocket': '/home/app/websocket/webapps',
+            'batch': '/home/app/tomcat/webapps',
+            'memcache': '/home/app/memcached',
+            'sdk': '/home/app/sdk/tomcat/webapps'}
+ 
 #src backup package path
 bsrc_path_lt = {'tomcat': ['/tmp/2', '/tmp/1'],
-                'apache': ['/tmp'],
+                'apache': ['/usr/local/apache2/conf'],
                 'websocket': ['/tmp']}
+ 
 #des backup package path
-bdes_path = '/tmp/backup'
+bdes_path = '/home/mrdTomcat/version_bak'
+ 
 #service name and server start bin 
-srv_up = {'tomcat': '/home/mrdTcomat/app/tomcat/bin/start.sh',
-          'apache': '',
-          'websocket': ''}
+srv_up = {'webap': '/home/app/webap/tomcat/bin/startup.sh',
+          'apache': '/usr/local/apache/bin/apachectl start',
+          'websocket': '/home/app/websocket/bin/jetty.sh start',
+          'batch': '/home/app/tomcat/bin/startup.sh',
+          'memcache': '/home/app/memcached/bin/start.sh',
+          'sdk': '/home/app/tomcat/bin/startup.sh'}
+ 
 #service name and server stop bin 
-srv_down = {'tomcat': '/home/mrdTcomat/app/tomcat/bin/shutdown.sh',
-            'apache': '',
-            'websocket': ''}
+srv_down = {'webap': '/home/app/tomcat/bin/shutdown.sh',
+            'apache': '/usr/local/apache/bin/apachectl stop',
+            'websocket': '/home/app/websocket/bin/jetty.sh stop',
+            'batch': '/home/app/tomcat/bin/shutdown.sh',
+            'memcache': '/home/app/memcached/bin/stop.sh',
+            'sdk': '/home/app/tomcat/bin/shutdown.sh'}
+ 
+#server pidfile path
+srv_pidfile = {'webap': '/var/run/webap/webap.pid',
+               'apache': '',
+               'websocket': '',
+               'batch': '',
+               'memcache': '',
+               'sdk': ''}
  
  
 #change return color
@@ -50,9 +74,14 @@ def start(ServiceName):
         CLI Example:
                 opsmod.py ServiceName start
     '''    
+    pid = srv_pidfile[ServiceName]
     cmd = srv_up[ServiceName]
-    proc = Popen(cmd, shell=True)
-    return G('Start GameServer is successful !')
+    logging.info('{0} start'.format(ServiceName))  
+    if os.path.exists(pid):
+        return R('GameServer is already running !')
+    else:
+        proc = Popen(cmd, shell=True)
+        return G('Start GameServer is successful !')
  
  
 def stop(ServiceName):
@@ -62,9 +91,14 @@ def stop(ServiceName):
         CLI Example:
                 opsmod.py ServiceName stop
     '''    
+    pid = srv_pidfile[ServiceName]
     cmd = srv_down[ServiceName]
-    proc = Popen(cmd, shell=True)
-    return G('Stop GameServer is running...,please wait !')
+    logging.info('{0} stop'.format(ServiceName))  
+    if os.path.exists(pid):
+        proc = Popen(cmd, shell=True)
+        return G('Stop GameServer is running...,please wait !')
+    else:
+        return R('GameServer is already stopped !')
  
  
 def status(ServiceName):
@@ -74,11 +108,13 @@ def status(ServiceName):
         CLI Example:
                 opsmod.py ServiceName status
     '''    
-    cmd = 'ps -ef|grep {0}|grep -v grep'.format(ServiceName)
+    cmd = 'ps -ef|grep "{0}"|grep -v grep'.format(ServiceName)
     proc = Popen(cmd, stdout=subprocess.PIPE, shell=True)
-    item = proc.stdout.read()
-    cot = len(item.split('\n')) - int(1)
-    ret = item + '\n' + '*'*80 + '\n' + 'The total of process is {0} !'.format(cot)
+    item = proc.stdout.read().split('\n')[:-2]
+    its = '\n'.join(item)
+    cot = len(item)
+    ret = its + '\n' + '*'*80 + '\n' + 'The total of process is {0} !'.format(cot)
+    logging.info('{0} status'.format(ServiceName))  
     return G(ret)
  
  
@@ -89,6 +125,7 @@ def update(ServiceName, Pkg):
         CLI Example:
                 opsmod.py ServiceName update Pkg
     '''    
+    logging.info('{0} update {1}'.format(ServiceName, Pkg))  
     if Pkg:
         fl = os.path.join(src_path, Pkg)
         try:
@@ -109,6 +146,7 @@ def backup(ServiceName):
         CLI Example:
                 opsmod.py ServiceName backup
     '''    
+    logging.info('{0} backup'.format(ServiceName))  
     bakname = ServiceName + '_' +  datetime.datetime.now().strftime('%Y%m%d%H%M%S') + '.zip'
     zipname = os.path.join(bdes_path, bakname)
     f = zipfile.ZipFile(zipname, 'w', zipfile.ZIP_DEFLATED)
@@ -125,6 +163,17 @@ def backup(ServiceName):
  
  
 if __name__== "__main__":
+    if os.path.exists('./logs'):
+        pass
+    else:
+        os.makedirs('./logs')
+    log_ft = datetime.datetime.now().strftime('%Y-%m-%d-%H') 
+    user_cmd = getpass.getuser()
+    logging.basicConfig(level=logging.DEBUG,  
+                    format='%(asctime)s {0} %(levelname)s: %(message)s'.format(user_cmd),  
+                    datefmt='%Y-%m-%d %H:%M:%S',  
+                    filename='./logs/control{0}.log'.format(log_ft),  
+                    filemode='a')  
     opts = sys.argv
     try:
         if opts[1]=='-d' or opts[1]=='--help':
@@ -147,3 +196,4 @@ def backup(ServiceName):
             print R('Script Parameter Error !!!')
     except IndexError:
         print R('Script Parameter Error !!!')
+
