github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

增加进程pid

pull/2/head
ibuler 2014-11-02 15:23:45 +08:00
parent 44166e2653
commit ac926b5fb4
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jumpserver.py
View File

@ -22,7 +22,7 @@ cur_dir = os.path.dirname(__file__)
sys.path.append('%s/webroot/AutoSa/' % cur_dir) sys.path.append('%s/webroot/AutoSa/' % cur_dir)
os.environ['DJANGO_SETTINGS_MODULE'] = 'AutoSa.settings' os.environ['DJANGO_SETTINGS_MODULE'] = 'AutoSa.settings'
from UserManage.models import User, Logs from UserManage.models import User, Logs, Pid
from Assets.models import Assets from Assets.models import Assets
@ -123,7 +123,6 @@ def connect(host, port, user, password):
datetime_start = time.strftime('%Y%m%d%H%M%S', structtime_start) datetime_start = time.strftime('%Y%m%d%H%M%S', structtime_start)
logtime_start = time.strftime('%Y/%m/%d %H:%M:%S', structtime_start) logtime_start = time.strftime('%Y/%m/%d %H:%M:%S', structtime_start)
timestamp_start = int(time.mktime(structtime_start)) timestamp_start = int(time.mktime(structtime_start))
logfile_name = "%s/%s_%s_%s" % (log_date_dir, host, user, datetime_start) logfile_name = "%s/%s_%s_%s" % (log_date_dir, host, user, datetime_start)
logfile = open(logfile_name, 'a') logfile = open(logfile_name, 'a')
log = Logs(user=user, host=host, logfile=logfile_name, start_time=timestamp_start) log = Logs(user=user, host=host, logfile=logfile_name, start_time=timestamp_start)
@ -136,6 +135,8 @@ def connect(host, port, user, password):
foo.logfile = logfile foo.logfile = logfile
foo.sendline('') foo.sendline('')
signal.signal(signal.SIGWINCH, sigwinch_passthrough) signal.signal(signal.SIGWINCH, sigwinch_passthrough)
pid = Pid(pid=os.getpid())
pid.save()
foo.interact(escape_character=chr(28)) foo.interact(escape_character=chr(28))
logfile.write('\n%s' % time.strftime('%Y/%m/%d %H:%M:%S')) logfile.write('\n%s' % time.strftime('%Y/%m/%d %H:%M:%S'))
log.finish = 1 log.finish = 1

4
webroot/AutoSa/UserManage/models.py
View File

@ -35,4 +35,8 @@ class Logs(models.Model):
return self.logfile return self.logfile
class Pid(models.Model):
pid = models.IntegerField()