summaryrefslogtreecommitdiff
path: root/bin/tinyerp-server.py
diff options
context:
space:
mode:
authorOlivier Laurent <olt@tinyerp.com>2008-08-12 16:44:56 +0200
committerOlivier Laurent <olt@tinyerp.com>2008-08-12 16:44:56 +0200
commitcc5a062faf56e86b39e604d9432b5237e87ad018 (patch)
tree60e20e39eb7aaab21ff3f0325bbc0f3db4ec2735 /bin/tinyerp-server.py
parent4c2a727132ddc99e1794d594a46d73cfc8ead353 (diff)
pep8
bzr revid: olt@tinyerp.com-20080812144456-xvh2y1ybziok9twi
Diffstat (limited to 'bin/tinyerp-server.py')
-rwxr-xr-xbin/tinyerp-server.py29
1 files changed, 15 insertions, 14 deletions
diff --git a/bin/tinyerp-server.py b/bin/tinyerp-server.py
index 3bef58fb0c9..969cd507965 100755
--- a/bin/tinyerp-server.py
+++ b/bin/tinyerp-server.py
@@ -50,7 +50,7 @@ __builtin__.__dict__['tinyerp_version_string'] = "Tiny ERP Server " + __version_
#----------------------------------------------------------
# python imports
#----------------------------------------------------------
-import sys,os,signal
+import sys, os, signal
#----------------------------------------------------------
# ubuntu 8.04 has obsoleted `pyxml` package and installs here.
# the path needs to be updated before any `import xml`
@@ -75,9 +75,9 @@ logger = netsvc.Logger()
import tools
import time
-if sys.platform=='win32':
+if sys.platform == 'win32':
import mx.DateTime
- mx.DateTime.strptime = lambda x,y: mx.DateTime.mktime(time.strptime(x, y))
+ mx.DateTime.strptime = lambda x, y: mx.DateTime.mktime(time.strptime(x, y))
#os.chdir(tools.file_path_root)
@@ -104,9 +104,9 @@ try:
except psycopg.OperationalError, err:
logger.notifyChannel("init", netsvc.LOG_ERROR, "could not connect to database '%s'!" % (tools.config["db_name"],))
- msg = str(err).replace("FATAL:","").strip()
+ msg = str(err).replace("FATAL:", "").strip()
db_msg = "database \"%s\" does not exist" % (tools.config["db_name"],)
-
+
# Note: this is ugly but since psycopg only uses one exception for all errors
# I don't think it's possible to do differently
if msg == db_msg:
@@ -165,7 +165,7 @@ if tools.config['upgrade']:
tools.config['update'][m] = 1
#----------------------------------------------------------
-# import basic modules
+# import basic modules
#----------------------------------------------------------
import osv, workflow, report, service
@@ -190,7 +190,7 @@ if tools.config["translate_out"]:
buf = file(tools.config["translate_out"], "w")
tools.trans_export(tools.config["language"], tools.config["translate_modules"], buf, fileformat)
buf.close()
-
+
logger.notifyChannel("init", netsvc.LOG_INFO, 'translation file written succesfully')
sys.exit(0)
@@ -217,12 +217,12 @@ if tools.config['xmlrpc']:
sys.exit(1)
interface = tools.config["interface"]
secure = tools.config["secure"]
-
- httpd = netsvc.HttpDaemon(interface,port, secure)
-
+
+ httpd = netsvc.HttpDaemon(interface, port, secure)
+
if tools.config["xmlrpc"]:
xml_gw = netsvc.xmlrpc.RpcGateway('web-services')
- httpd.attach("/xmlrpc", xml_gw )
+ httpd.attach("/xmlrpc", xml_gw)
logger.notifyChannel("web-services", netsvc.LOG_INFO,
"starting XML-RPC" + \
(tools.config['secure'] and ' Secure' or '') + \
@@ -242,10 +242,11 @@ if tools.config['netrpc']:
logger.notifyChannel("init", netsvc.LOG_ERROR, "invalid port '%s'!" % (tools.config["netport"],))
sys.exit(1)
netinterface = tools.config["netinterface"]
-
+
tinySocket = netsvc.TinySocketServerThread(netinterface, netport, False)
logger.notifyChannel("web-services", netsvc.LOG_INFO, "starting netrpc service, port "+str(netport))
+
def handler(signum, frame):
from tools import config
if tools.config['netrpc']:
@@ -259,8 +260,8 @@ def handler(signum, frame):
from tools import config
if config['pidfile']:
- fd=open(config['pidfile'], 'w')
- pidtext="%d" % (os.getpid())
+ fd = open(config['pidfile'], 'w')
+ pidtext = "%d" % (os.getpid())
fd.write(pidtext)
fd.close()