diff options
Diffstat (limited to 'python/http-server.py')
| -rw-r--r-- | python/http-server.py | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/python/http-server.py b/python/http-server.py index 5e04b0f7..0125acf2 100644 --- a/python/http-server.py +++ b/python/http-server.py @@ -13,7 +13,7 @@ class MyHandler(BaseHTTPRequestHandler): insert_quotes() if self.path == "/insert_intex_data": workdate = str(datetime.date.today()) - intex_data(self.server.conn, workdate, self.server.logger) + intex_data(self.server.conn, workdate) self.send_response(200) self.end_headers() @@ -30,33 +30,28 @@ class MyHandler(BaseHTTPRequestHandler): self.end_headers() def log_message(self, format, *args): - self.server.logger.info("%s - - [%s] %s" % - (self.address_string(), - self.log_date_time_string(), - format%args)) + logging.info("%s - - [%s] %s" % + (self.address_string(), + self.log_date_time_string(), + format%args)) class MyServer(HTTPServer): - def __init__(self, addr, handler, logger, queue, conn): + def __init__(self, addr, handler, queue, conn): HTTPServer.__init__(self, addr, handler) - self.logger = logger self.queue = queue self.conn = conn class MyDaemon(Daemon): def run(self): server_address = ('',8000) - logger = logging.getLogger('tasks') - logger.setLevel('INFO') - fh = logging.FileHandler("/home/share/CorpCDOs/logs/tasks.log") - fh.setLevel('INFO') - logger.addHandler(fh) + logging.basicConfig(filename='/home/share/CorpCDOs/logs/tasks.log', level=logging.INFO) q = redis.Redis(unix_socket_path='/var/run/redis/redis.sock') self.conn = psycopg2.connect(database="ET", user="et_user", password="Serenitas1", host="debian", cursor_factory=DictCursor) - http = MyServer(server_address, MyHandler, logger, q, self.conn) + http = MyServer(server_address, MyHandler, q, self.conn) http.serve_forever() if __name__=="__main__": |