Author: essiene
Date: Wed Oct 8 07:16:23 2008
New Revision: 17
Modified:
trunk/src/simpleweb/webserver.py
Log:
indentation
Modified: trunk/src/simpleweb/webserver.py
==============================================================================
--- trunk/src/simpleweb/webserver.py (original)
+++ trunk/src/simpleweb/webserver.py Wed Oct 8 07:16:23 2008
@@ -1,36 +1,39 @@
-import os, pwd, grp
+import os
from wsgiref.simple_server import make_server
import simpleweb.utils
def wsgiserve(wsgiapp, host='127.0.0.1', port=8080, reload=True,
user='nobody', group='nobody', infomsg=None, warnmsg=None):
- if reload:
- reload_status = 'On'
- else:
- reload_status = 'Off'
-
- server = make_server(host, port, wsgiapp)
-
- if os.geteuid() == 0: #only do this if we're root
- try:
- gid = grp.getgrnam(group)[2]
- uid = pwd.getpwnam(user)[3]
- except KeyError:
- simpleweb.utils.msg_err("Could not find the specified user/group on the
system, ignoring and running as '%s'" %(pwd.getpwuid(os.geteuid())[0]))
- pass
- else:
- if os.name == 'posix':
- os.setgid(gid)
- os.setuid(uid)
-
- simpleweb.utils.msg_info("simpleweb.webserver - v0.2")
- simpleweb.utils.msg_info("Based on wsgiref.simple_server")
+ if reload:
+ reload_status = 'On'
+ else:
+ reload_status = 'Off'
+
+ server = make_server(host, port, wsgiapp)
+
+ if os.name == 'posix':
+ import pwd, grp
+
+ if os.geteuid() == 0: #only do this if we're root
+ try:
+ gid = grp.getgrnam(group)[2]
+ uid = pwd.getpwnam(user)[3]
+ except KeyError:
+ simpleweb.utils.msg_err("Could not find the specified
user/group on the system, ignoring and running
as '%s'" %(pwd.getpwuid(os.geteuid())[0]))
+ pass
+ else:
+ if os.name == 'posix':
+ os.setgid(gid)
+ os.setuid(uid)
+
+ simpleweb.utils.msg_info("simpleweb.webserver - v0.2")
+ simpleweb.utils.msg_info("Based on wsgiref.simple_server")
- if infomsg:
- simpleweb.utils.msg_info(infomsg)
+ if infomsg:
+ simpleweb.utils.msg_info(infomsg)
- if warnmsg:
- simpleweb.utils.msg_warn(warnmsg)
+ if warnmsg:
+ simpleweb.utils.msg_warn(warnmsg)
- simpleweb.utils.msg_info("Now Serving on %s port %s [reloading
= %s]..." % (host, port, reload_status))
- server.serve_forever()
+ simpleweb.utils.msg_info("Now Serving on %s port %s [reloading
= %s]..." % (host, port, reload_status))
+ server.serve_forever()
|
