git://git.onelab.eu
/
plcapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9fe08b5
)
modified variable name
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Wed, 12 Sep 2012 20:29:56 +0000
(16:29 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Wed, 12 Sep 2012 20:29:56 +0000
(16:29 -0400)
Server.py
patch
|
blob
|
history
diff --git
a/Server.py
b/Server.py
index
fe4a8b4
..
fad4bb9
100755
(executable)
--- a/
Server.py
+++ b/
Server.py
@@
-68,7
+68,7
@@
class App:
# Defaults
addr = "0.0.0.0"
port = 8000
# Defaults
addr = "0.0.0.0"
port = 8000
-config
= '/etc/planetlab/plc
_config'
+config
_file = '/etc/planetlab/plcapi
_config'
keyfile=None
certfile=None
keyfile=None
certfile=None
@@
-94,11
+94,14
@@
if options.config:
addr = config
keyfile = config.api_ssl_key_file
certfile = config.api_ssl_cert_file
addr = config
keyfile = config.api_ssl_key_file
certfile = config.api_ssl_cert_file
-
+else:
+ config = Config(config_file)
if options.port:
port = int(options.port)
if options.port:
port = int(options.port)
+#api=API(config)
+
# Start server
if keyfile and certfile:
server = pywsgi.WSGIServer((addr, port), App(), keyfile=keyfile, certfile=certfile)
# Start server
if keyfile and certfile:
server = pywsgi.WSGIServer((addr, port), App(), keyfile=keyfile, certfile=certfile)