diff options
| -rw-r--r-- | photoblaster/db/pb.py | 5 | ||||
| -rw-r--r-- | photoblaster/modules/base.py | 4 | ||||
| -rw-r--r-- | run_server.py | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/photoblaster/db/pb.py b/photoblaster/db/pb.py index 1263b56..f55b9ee 100644 --- a/photoblaster/db/pb.py +++ b/photoblaster/db/pb.py @@ -1,6 +1,5 @@ """all database connections and logic goes here""" import time -import sys import simplejson as json from photoblaster.db import Db from photoblaster.db.imcmd import ImCmd @@ -39,5 +38,5 @@ class Pb(Db): session.commit() # FIXME session.close().... except Exception as e: - sys.stderr.write("Unable to commit database entry\n") - sys.stderr.write(str(e)) + self.log_error("Unable to commit database entry") + self.log_error(str(e)) diff --git a/photoblaster/modules/base.py b/photoblaster/modules/base.py index b41efd5..3f45058 100644 --- a/photoblaster/modules/base.py +++ b/photoblaster/modules/base.py @@ -14,7 +14,7 @@ from photoblaster.params import Params import sha import simplejson as json from photoblaster.s3cli import S3Cli -from photoblaster.db import Db +from photoblaster.db.pb import Pb as DbPb BASE_URL = "http://i.asdf.us" _MAX_FILENAME_LENGTH = 20 @@ -186,7 +186,7 @@ class Pb(object): def db_send(self, remote_addr=None, db_connection=None): try: - db = db_connection or Db() + db = db_connection or DbPb() except Exception as e: sys.stderr.write("Could not connect to db:\n{}".format(e)) sys.exit(1) diff --git a/run_server.py b/run_server.py index 5cff199..8e15896 100644 --- a/run_server.py +++ b/run_server.py @@ -1,10 +1,10 @@ #!/usr/bin/python2 -"""used to run the webserver""" +"""script used to run the webserver""" import sys -sys.path.append("./lib") +sys.path.append("./photoblaster") from server import Server + server = Server() if __name__ == "__main__": server.run_wsgi() - |