git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch
[plcapi.git]
/
Server.py
diff --git
a/Server.py
b/Server.py
index
8314281
..
84c3360
100755
(executable)
--- a/
Server.py
+++ b/
Server.py
@@
-5,7
+5,7
@@
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id$
+# $Id
: Server.py,v 1.3 2006/10/25 20:33:07 mlhuang Exp
$
#
import os
#
import os
@@
-14,6
+14,9
@@
import getopt
import traceback
import BaseHTTPServer
import traceback
import BaseHTTPServer
+# Append PLC to the system path
+sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0])))
+
from PLC.API import PLCAPI
class PLCAPIRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
from PLC.API import PLCAPI
class PLCAPIRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
@@
-31,9
+34,12
@@
class PLCAPIRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
# Write response
self.send_response(200)
# Write response
self.send_response(200)
+ self.send_header("Content-type", "text/xml")
+ self.send_header("Content-length", str(len(response)))
+ self.end_headers()
self.wfile.write(response)
self.wfile.write(response)
- self.wfile.flush()
+ self.wfile.flush()
self.connection.shutdown(1)
except Exception, e:
self.connection.shutdown(1)
except Exception, e:
@@
-67,7
+73,7
@@
class PLCAPIServer(BaseHTTPServer.HTTPServer):
# Defaults
addr = "0.0.0.0"
port = 8000
# Defaults
addr = "0.0.0.0"
port = 8000
-config = "/etc/planetlab/plc_config
.xml
"
+config = "/etc/planetlab/plc_config"
def usage():
print "Usage: %s [OPTION]..." % sys.argv[0]
def usage():
print "Usage: %s [OPTION]..." % sys.argv[0]