fixed deprecated flask; set default ip address for control server to …

…handle local case
cmusatyalab · Oct 11, 2019 · 4bfe58f · 4bfe58f
1 parent a474b4b
commit 4bfe58f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/server/bin/gabriel-control b/server/bin/gabriel-control
@@ -94,7 +94,7 @@ def process_command_line(argv):
             '-n', '--net_interface', action = 'store', default = "eth0",
             help = "the network interface with which the cognitive engines communicate")
     parser.add_option(
-            '-s', '--service_ip', action = 'store',
+            '-s', '--service_ip', action = 'store', default = "0.0.0.0",
             help = "Use supplied IP address when returning enpoints for services. Useful when running in a container or VM with a externally assigned public IP.")
     settings, args = parser.parse_args(argv)
 

diff --git a/server/gabriel/common/network/REST_server.py b/server/gabriel/common/network/REST_server.py
@@ -26,15 +26,8 @@
 import sys
 from flask import Flask
 from flask import request
-try:
-	from flask.ext import restful
-	from flask.ext.restful import abort
-	from flask.ext.restful import reqparse
-	from flask.ext.restful import Resource
-except ImportError:
-	import flask_restful as restful
-	from flask_restful import abort, reqparse, Resource
-
+import flask_restful as restful
+from flask_restful import abort, reqparse, Resource
 try:
     str(b'0x1','ascii')
     def mystr(b):