change option name to adapter

jasonsun1347 · jasonsun1347 · commit 997362f61bee · 2016-01-27T10:35:18.000+08:00
diff --git a/lib/utils/api.py b/lib/utils/api.py
@@ -637,7 +637,7 @@ def download(taskid, target, filename):
         return jsonize({"success": False, "message": "File does not exist"})
 
 
-def server(host=RESTAPI_DEFAULT_ADDRESS, port=RESTAPI_DEFAULT_PORT, server_name='wsgiref'):
+def server(host=RESTAPI_DEFAULT_ADDRESS, port=RESTAPI_DEFAULT_PORT, adapter='wsgiref'):
     """
     REST-JSON API server
     """
@@ -655,14 +655,14 @@ def server(host=RESTAPI_DEFAULT_ADDRESS, port=RESTAPI_DEFAULT_PORT, server_name=
 
     # Run RESTful API
     try:
-        if server_name == 'gevent':
+        if adapter == 'gevent':
             from gevent import monkey
             monkey.patch_all()
-        elif server_name == 'eventlet':
+        elif adapter == 'eventlet':
             import eventlet
             eventlet.monkey_patch()
-        logger.debug('use {0} adapter run bottle'.format(server_name))
-        run(host=host, port=port, quiet=True, debug=False, server=server_name)
+        logger.debug('use {0} adapter run bottle'.format(adapter))
+        run(host=host, port=port, quiet=True, debug=False, server=adapter)
     except socket.error, ex:
         if "already in use" in getSafeExString(ex):
             logger.error("Address already in use ('%s:%s')" % (host, port))
diff --git a/sqlmapapi.py b/sqlmapapi.py
@@ -37,12 +37,12 @@ def main():
     apiparser.add_option("-c", "--client", help="Act as a REST-JSON API client", default=RESTAPI_DEFAULT_PORT, action="store_true")
     apiparser.add_option("-H", "--host", help="Host of the REST-JSON API server", default=RESTAPI_DEFAULT_ADDRESS, action="store")
     apiparser.add_option("-p", "--port", help="Port of the the REST-JSON API server", default=RESTAPI_DEFAULT_PORT, type="int", action="store")
-    apiparser.add_option("", "--servername", help="bottle Server adapter to use default is wsgiref, see bottle document ", default='wsgiref', action="store")
+    apiparser.add_option("", "--adapter", help="bottle Server adapter to use default is wsgiref, see bottle document ", default='wsgiref', action="store")
     (args, _) = apiparser.parse_args()
 
     # Start the client or the server
     if args.server is True:
-        server(args.host, args.port, server_name=args.servername)
+        server(args.host, args.port, adapter=args.adapter)
     elif args.client is True:
         client(args.host, args.port)
     else:
