From de2837229ce4d988d8f255159c219ffafaab3eab Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Fri, 31 Oct 2014 00:07:33 +0800
Subject: [PATCH] modify logdir , asset beizhu

---
 jumpserver.py                           | 7 ++++---
 webroot/AutoSa/templates/addAssets.html | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/jumpserver.py b/jumpserver.py
index e07a6485d..d4754b33f 100755
--- a/jumpserver.py
+++ b/jumpserver.py
@@ -105,9 +105,10 @@ def run_cmd(cmd):
 
 def connect(host, port, user, password):
     """Use pexpect module to connect other server."""
-    if not os.path.isdir(log_dir):
-        os.mkdir(log_dir)
-    logfile = open("%s/%s_%s_%s" % (log_dir, host, time.strftime('%Y%m%d'), user), 'a')
+    log_date_dir = '%s/%s' % (log_dir, time.strftime('%Y%m%d'))
+    if not os.path.isdir(log_date_dir):
+        os.mkdir(log_date_dir)
+    logfile = open("%s/%s_%s" % (log_date_dir, host, user), 'a')
     logfile.write('\n\n%s\n\n' % time.strftime('%Y%m%d_%H%M%S'))
     cmd = 'ssh -q -p %s %s@%s' % (port, user, host)
     global foo
diff --git a/webroot/AutoSa/templates/addAssets.html b/webroot/AutoSa/templates/addAssets.html
index 1d7d3c97b..f230b7b7a 100644
--- a/webroot/AutoSa/templates/addAssets.html
+++ b/webroot/AutoSa/templates/addAssets.html
@@ -34,7 +34,7 @@
             <div class="form-group">
                 <label for="comment" class="col-sm-2 control-label">备注<span style="color: red"></span></label>
                 <div class="col-sm-4">
-                    <input type="text" class="form-control" id="comment" name="comment" placeholder="备注">
+                    <input type="text" class="form-control" id="comment" name="comment" placeholder="备注(最好是英文)">
                 </div>
             </div>