|
|
@@ -34,31 +34,35 @@ def has_proc(name):
|
|
|
def restart(item):
|
|
|
name = item['file_name']
|
|
|
cmd = item['cmd']
|
|
|
- if not name:
|
|
|
- print 'file name is empty'
|
|
|
- return
|
|
|
-
|
|
|
- cur_pid = os.getpid()
|
|
|
- pids = file_pid(name)
|
|
|
- print "start restart " + name
|
|
|
- for pid in pids:
|
|
|
- try:
|
|
|
- if cur_pid != pid:
|
|
|
- os.kill(pid, signal.SIGKILL)
|
|
|
- print 'kill pid=', pid
|
|
|
- else:
|
|
|
- continue
|
|
|
- except OSError, e:
|
|
|
- print "OSError no=", e.errno, " err=", e.strerror
|
|
|
- pass
|
|
|
- except BaseException, be:
|
|
|
- pass
|
|
|
+ tip = item['tip']
|
|
|
+
|
|
|
+
|
|
|
+ if name:
|
|
|
+ cur_pid = os.getpid()
|
|
|
+ pids = file_pid(name)
|
|
|
+ print "start restart " + name
|
|
|
+ for pid in pids:
|
|
|
+ try:
|
|
|
+ if cur_pid != pid:
|
|
|
+ os.kill(pid, signal.SIGKILL)
|
|
|
+ print 'kill pid=', pid
|
|
|
+ else:
|
|
|
+ continue
|
|
|
+ except OSError, e:
|
|
|
+ print "OSError no=", e.errno, " err=", e.strerror
|
|
|
+ pass
|
|
|
+ except BaseException, be:
|
|
|
+ pass
|
|
|
|
|
|
if cmd:
|
|
|
print cmd
|
|
|
time.sleep(1)
|
|
|
os.system(cmd)
|
|
|
time.sleep(1)
|
|
|
+
|
|
|
+ if tip:
|
|
|
+ print "tip:",tip
|
|
|
+
|
|
|
return
|
|
|
|
|
|
|
|
|
@@ -78,61 +82,61 @@ def main():
|
|
|
cmds = []
|
|
|
if mac_sys() :
|
|
|
if option == 'fcgi':
|
|
|
- cmds.append({'file_name': 'fcgi_run.php','cmd': 'spawn-fcgi -a 127.0.0.1 -p 9100 -F 1 -f "php fcgi_run.php"'})
|
|
|
+ cmds.append({'file_name': 'fcgi_run.php','cmd': 'spawn-fcgi -a 127.0.0.1 -p 9100 -F 1 -f "php fcgi_run.php"','tip':''})
|
|
|
elif option == 'queue':
|
|
|
- cmds.append({'file_name': 'crontab.php','cmd': ''})
|
|
|
+ cmds.append({'file_name': 'crontab.php','cmd': '','tip':''})
|
|
|
elif option == 'ugc' :
|
|
|
- cmds.append({'file_name': 'mac_ugcman', 'cmd': 'sudo ./mac_ugcman'})
|
|
|
- cmds.append({'file_name': 'ugc_srv.php','cmd': 'php ugc_srv.php'})
|
|
|
+ cmds.append({'file_name': 'mac_ugcman', 'cmd': 'sudo ./mac_ugcman','tip':''})
|
|
|
+ cmds.append({'file_name': 'ugc_srv.php','cmd': 'php ugc_srv.php','tip':"tip: tail -f -n 20 /tmp/ugcman.out"})
|
|
|
elif option == 'center':
|
|
|
- cmds.append({'file_name': 'centra_srv.php','cmd': 'php centra_srv.php'})
|
|
|
+ cmds.append({'file_name': 'centra_srv.php','cmd': 'php centra_srv.php','tip':''})
|
|
|
elif option == 'room':
|
|
|
- cmds.append({'file_name': 'room_factory.php', 'cmd': 'php room_factory.php'})
|
|
|
- cmds.append({'file_name': 'room_srv.php', 'cmd': 'php room_srv.php'})
|
|
|
- cmds.append({'file_name': 'mac_webacc', 'cmd': './mac_webacc'})
|
|
|
+ cmds.append({'file_name': 'room_factory.php', 'cmd': 'php room_factory.php','tip':''})
|
|
|
+ cmds.append({'file_name': 'room_srv.php', 'cmd': 'php room_srv.php','tip':''})
|
|
|
+ cmds.append({'file_name': 'mac_webacc', 'cmd': './mac_webacc','tip':'tail -f -n 20 /tmp/webacc.out'})
|
|
|
elif option == 'all':
|
|
|
- cmds.append({'file_name': 'fcgi_run.php', 'cmd': 'spawn-fcgi -a 127.0.0.1 -p 9100 -F 1 -f "php fcgi_run.php"'})
|
|
|
+ cmds.append({'file_name': 'fcgi_run.php', 'cmd': 'spawn-fcgi -a 127.0.0.1 -p 9100 -F 1 -f "php fcgi_run.php"','tip':''})
|
|
|
cmds.append({'file_name': 'crontab.php', 'cmd': ''})
|
|
|
- cmds.append({'file_name': 'mac_ugcman', 'cmd': './mac_ugcman'})
|
|
|
- cmds.append({'file_name': 'ugc_srv.php', 'cmd': 'php ugc_srv.php'})
|
|
|
- cmds.append({'file_name': 'centra_srv.php', 'cmd': 'php centra_srv.php'})
|
|
|
- cmds.append({'file_name': 'room_factory.php', 'cmd': 'php room_factory.php'})
|
|
|
- cmds.append({'file_name': 'room_srv.php', 'cmd': 'php room_srv.php'})
|
|
|
- cmds.append({'file_name': 'mac_webacc', 'cmd': './mac_webacc'})
|
|
|
+ cmds.append({'file_name': 'mac_ugcman', 'cmd': './mac_ugcman','tip':''})
|
|
|
+ cmds.append({'file_name': 'ugc_srv.php', 'cmd': 'php ugc_srv.php','tip':''})
|
|
|
+ cmds.append({'file_name': 'centra_srv.php', 'cmd': 'php centra_srv.php','tip':''})
|
|
|
+ cmds.append({'file_name': 'room_factory.php', 'cmd': 'php room_factory.php','tip':''})
|
|
|
+ cmds.append({'file_name': 'room_srv.php', 'cmd': 'php room_srv.php','tip':''})
|
|
|
+ cmds.append({'file_name': 'mac_webacc', 'cmd': './mac_webacc','tip':'tail -f -n 20 /tmp/ugcman.out\n tail -f -n 20 /tmp/webacc.out'})
|
|
|
else:
|
|
|
- cmds.append({'file_name': 'fcgi_run.php', 'cmd': 'spawn-fcgi -a 127.0.0.1 -p 9100 -F 1 -f "php fcgi_run.php"'})
|
|
|
+ cmds.append({'file_name': 'fcgi_run.php', 'cmd': 'spawn-fcgi -a 127.0.0.1 -p 9100 -F 1 -f "php fcgi_run.php"','tip':''})
|
|
|
cmds.append({'file_name': 'crontab.php', 'cmd': ''})
|
|
|
else :
|
|
|
if option == 'fcgi':
|
|
|
- cmds.append({'file_name': 'fcgi_run.php', 'cmd': 'spawn-fcgi -a 127.0.0.1 -p 9100 -F 10 -f "php fcgi_run.php"'})
|
|
|
+ cmds.append({'file_name': 'fcgi_run.php', 'cmd': 'spawn-fcgi -a 127.0.0.1 -p 9100 -F 10 -f "php fcgi_run.php"','tip':''})
|
|
|
elif option == 'queue':
|
|
|
- cmds.append({'file_name': 'crontab.php', 'cmd': ''})
|
|
|
+ cmds.append({'file_name': 'crontab.php', 'cmd': '','tip':''})
|
|
|
elif option == 'ugc':
|
|
|
- cmds.append({'file_name': 'ugcman', 'cmd': './ugcman'})
|
|
|
- cmds.append({'file_name': 'ugc_srv.php', 'cmd': 'php ugc_srv.php'})
|
|
|
+ cmds.append({'file_name': 'ugcman', 'cmd': './ugcman','tip':''})
|
|
|
+ cmds.append({'file_name': 'ugc_srv.php', 'cmd': 'php ugc_srv.php','tip':'tail -f -n 20 /tmp/ugcman.out'})
|
|
|
elif option == 'center':
|
|
|
cmds.append({'file_name': 'centra_srv.php', 'cmd': 'php centra_srv.php'})
|
|
|
elif option == 'room':
|
|
|
- cmds.append({'file_name': 'room_factory.php', 'cmd': 'php room_factory.php'})
|
|
|
- cmds.append({'file_name': 'room_srv.php', 'cmd': 'php room_srv.php'})
|
|
|
- cmds.append({'file_name': 'mac_webacc', 'cmd': './webacc'})
|
|
|
+ cmds.append({'file_name': 'room_factory.php', 'cmd': 'php room_factory.php','tip':''})
|
|
|
+ cmds.append({'file_name': 'room_srv.php', 'cmd': 'php room_srv.php','tip':''})
|
|
|
+ cmds.append({'file_name': 'webacc', 'cmd': './webacc','tip':'tail -f -n 20 /tmp/webacc.out'})
|
|
|
elif option == 'all':
|
|
|
- cmds.append({'file_name': 'fcgi_run.php', 'cmd': 'spawn-fcgi -a 127.0.0.1 -p 9100 -F 10 -f "php fcgi_run.php"'})
|
|
|
- cmds.append({'file_name': 'crontab.php', 'cmd': ''})
|
|
|
- cmds.append({'file_name': 'ugcman', 'cmd': './ugcman'})
|
|
|
- cmds.append({'file_name': 'ugc_srv.php', 'cmd': 'php ugc_srv.php'})
|
|
|
- cmds.append({'file_name': 'centra_srv.php', 'cmd': 'php centra_srv.php'})
|
|
|
- cmds.append({'file_name': 'room_factory.php', 'cmd': 'php room_factory.php'})
|
|
|
- cmds.append({'file_name': 'room_srv.php', 'cmd': 'php room_srv.php'})
|
|
|
- cmds.append({'file_name': 'mac_webacc', 'cmd': './webacc'})
|
|
|
+ cmds.append({'file_name': 'fcgi_run.php', 'cmd': 'spawn-fcgi -a 127.0.0.1 -p 9100 -F 10 -f "php fcgi_run.php"','tip':''})
|
|
|
+ cmds.append({'file_name': 'crontab.php', 'cmd': '','tip':''})
|
|
|
+ cmds.append({'file_name': 'ugcman', 'cmd': './ugcman','tip':''})
|
|
|
+ cmds.append({'file_name': 'ugc_srv.php', 'cmd': 'php ugc_srv.php','tip':''})
|
|
|
+ cmds.append({'file_name': 'centra_srv.php', 'cmd': 'php centra_srv.php','tip':''})
|
|
|
+ cmds.append({'file_name': 'room_factory.php', 'cmd': 'php room_factory.php','tip':''})
|
|
|
+ cmds.append({'file_name': 'room_srv.php', 'cmd': 'php room_srv.php','tip':''})
|
|
|
+ cmds.append({'file_name': 'webacc', 'cmd': './webacc','tip':''})
|
|
|
+ cmds.append({'file_name': '', 'cmd': 'tail -f -n 20 /tmp/webacc.out','tip':'tail -f -n 20 /tmp/ugcman.out\ntail -f -n 20 /tmp/webacc.out'})
|
|
|
else:
|
|
|
- cmds.append({'file_name': 'fcgi_run.php', 'cmd': 'spawn-fcgi -a 127.0.0.1 -p 9100 -F 10 -f "php fcgi_run.php"'})
|
|
|
- cmds.append({'file_name': 'crontab.php', 'cmd': ''})
|
|
|
+ cmds.append({'file_name': 'fcgi_run.php', 'cmd': 'spawn-fcgi -a 127.0.0.1 -p 9100 -F 10 -f "php fcgi_run.php"','tip':''})
|
|
|
+ cmds.append({'file_name': 'crontab.php', 'cmd': '','tip':''})
|
|
|
|
|
|
for item in cmds :
|
|
|
restart(item)
|
|
|
sys.exit(2)
|
|
|
|
|
|
-
|
|
|
if __name__ == '__main__':
|
|
|
main()
|
stanley-king