add start manager && fixed #28

Author: hustcc

app/__init__.py

@@ -11,11 +11,15 @@
 from celery import Celery, platforms
 from app.utils.validator import Validator
 from flask_socketio import SocketIO
+import eventlet
 
 
 # 版本号
 __version__ = '0.0.4'
 
+# monkey_patch
+eventlet.monkey_patch()
+
 # flask
 app = Flask(__name__)
 app.config.from_object('app.config_default')

app/static/dist/webhook.bundle.js

@@ -97,7 +97,7 @@ const Server = React.createClass({
               <th width="20%">IP</th>
               <th width="8%">Port</th>
               <th width="17%">Account</th>
-              <th width="10%">PKey</th>
+              <th width="10%">PKey / PassWord</th>
               <th width="15%">Time</th>
               <th width="10%">Operate</th>
             </tr>
@@ -148,7 +148,7 @@ const Server = React.createClass({
               </div>
             </div>
             <div className="field">
-              <label>SSH Private Key <Link to="/doc/pkey"><i className="ui icon help"></i></Link></label>
+              <label>SSH Private Key / Account PassWord<Link to="/doc/pkey"><i className="ui icon help"></i></Link></label>
               <textarea ref="pkey" defaultValue={this.state.editServer.pkey} rows="6"></textarea>
             </div>
           </form>

app/static/src/server.jsx

@@ -22,17 +22,20 @@ def do_ssh_cmd(ip, port, account, pkey, shell, push_data='', timeout=300):
     except:
         port = 22
 
-    pkey = pkey.strip() + '\n'  # 注意最后有一个换行
-
-    pkey_file = StringIO.StringIO(pkey)
-    private_key = paramiko.RSAKey.from_private_key(pkey_file)
-
     s = paramiko.SSHClient()
-
     s.load_system_host_keys()
     s.set_missing_host_key_policy(paramiko.AutoAddPolicy())
 
-    s.connect(ip, port, account, pkey=private_key)
+    try:
+        # 首先以 ssh 密钥方式登陆
+        pkey_file = StringIO.StringIO(pkey.strip() + '\n')  # 注意最后有一个换行
+        private_key = paramiko.RSAKey.from_private_key(pkey_file)
+        s.connect(ip, port, account, pkey=private_key, timeout=5)
+        pkey_file.close()
+    except:
+        # 如果出现异常，则使用 用户密码登陆的方式
+        s.connect(ip, port, account, password=pkey, timeout=5)
+
 #     if push_data:
 #     shell = shell + (" '%s'" % push_data)
     shell = shell.split('\n')
@@ -50,7 +53,6 @@ def do_ssh_cmd(ip, port, account, pkey, shell, push_data='', timeout=300):
         log = err
 
     s.close()
-    pkey_file.close()
 
     if success:
         success = is_log_success(log)

app/utils/SshUtil.py

@@ -0,0 +1,114 @@
+# -*- coding: utf-8 -*-
+'''
+Created on 2016-11-23
+
+@author: hustcc
+'''
+
+import subprocess
+import sys
+from flask_script import Manager, Command, Server as _Server, Option
+from app import SQLAlchemyDB as db, socketio, app, __version__
+
+
+manager = Manager(app)
+
+
+class Server(_Server):
+    help = description = 'Runs the Git-WebHook web server'
+
+    def get_options(self):
+        options = (
+            Option('-h', '--host',
+                   dest='host',
+                   default='0.0.0.0'),
+
+            Option('-p', '--port',
+                   dest='port',
+                   type=int,
+                   default=18340),
+
+            Option('-d', '--debug',
+                   action='store_true',
+                   dest='use_debugger',
+                   help=('enable the Werkzeug debugger (DO NOT use in '
+                         'production code)'),
+                   default=self.use_debugger),
+            Option('-D', '--no-debug',
+                   action='store_false',
+                   dest='use_debugger',
+                   help='disable the Werkzeug debugger',
+                   default=self.use_debugger),
+            Option('-r', '--reload',
+                   action='store_true',
+                   dest='use_reloader',
+                   help=('monitor Python files for changes (not 100%% safe '
+                         'for production use)'),
+                   default=self.use_reloader),
+            Option('-R', '--no-reload',
+                   action='store_false',
+                   dest='use_reloader',
+                   help='do not monitor Python files for changes',
+                   default=self.use_reloader),
+        )
+        return options
+
+    def __call__(self, app, host, port, use_debugger, use_reloader):
+        print host, port, use_debugger, use_reloader
+        # override the default runserver command to start a Socket.IO server
+        if use_debugger is None:
+            use_debugger = app.debug
+            if use_debugger is None:
+                use_debugger = True
+        if use_reloader is None:
+            use_reloader = app.debug
+        socketio.run(app,
+                     host=host,
+                     port=port,
+                     debug=use_debugger,
+                     use_reloader=use_reloader,
+                     **self.server_options)
+
+manager.add_command("runserver", Server())
+
+
+class CeleryWorker(Command):
+    """Starts the celery worker."""
+    name = 'celery'
+    capture_all_args = True
+
+    def run(self, argv):
+        cmd = ['celery', '-A', 'app.celeryInstance', 'worker'] + argv
+        ret = subprocess.call(cmd)
+        sys.exit(ret)
+
+
+manager.add_command("celery", CeleryWorker())
+
+
+@manager.command
+def createdb(drop_first=False):
+    """Creates the database."""
+    if drop_first:
+        db.drop_all()
+    db.create_all()
+    print('OK')
+
+
+@manager.command
+def lint():
+    """Runs code linter."""
+    lint = subprocess.call(['flake8']) == 0
+    if lint:
+        print('OK')
+    sys.exit(lint)
+
+
+@manager.command
+def version():
+    "get the version"
+    print __version__
+
+
+if __name__ == '__main__':
+    manager.run()