fixed sql query and debug code
This commit is contained in:
@@ -19,10 +19,11 @@ import socket
|
|||||||
import configparser
|
import configparser
|
||||||
import json
|
import json
|
||||||
import sqlite3
|
import sqlite3
|
||||||
from . import controller
|
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
from . import controller
|
||||||
|
|
||||||
|
|
||||||
class Daemon:
|
class Daemon:
|
||||||
daemonSection = 'daemon'
|
daemonSection = 'daemon'
|
||||||
@@ -46,7 +47,7 @@ class Daemon:
|
|||||||
|
|
||||||
self.sqldb.commit()
|
self.sqldb.commit()
|
||||||
|
|
||||||
self.controller = controller.Controller.from_db(sqldb)
|
self.controller = controller.Controller.from_db(self.sqldb)
|
||||||
print(self.controller)
|
print(self.controller)
|
||||||
|
|
||||||
server = self.SocketServer(self.config.get(self.daemonSection, 'host', fallback='0.0.0.0'),
|
server = self.SocketServer(self.config.get(self.daemonSection, 'host', fallback='0.0.0.0'),
|
||||||
@@ -60,12 +61,10 @@ class Daemon:
|
|||||||
def check_db(self):
|
def check_db(self):
|
||||||
c = self.sqldb.cursor()
|
c = self.sqldb.cursor()
|
||||||
try:
|
try:
|
||||||
c.execute("SELECT db_version FROM meta")
|
c.execute("SELECT value FROM meta WHERE option = 'db_version'")
|
||||||
db_version = c.fetchone()
|
db_version = c.fetchone()
|
||||||
c.close()
|
c.close()
|
||||||
|
|
||||||
print(db_version)
|
|
||||||
|
|
||||||
if db_version is not None:
|
if db_version is not None:
|
||||||
print("DB connection established; version={}".format(db_version[0]))
|
print("DB connection established; version={}".format(db_version[0]))
|
||||||
return True
|
return True
|
||||||
@@ -124,4 +123,3 @@ class Daemon:
|
|||||||
sock, addr = pair
|
sock, addr = pair
|
||||||
print('Incoming connection from %s' % repr(addr))
|
print('Incoming connection from %s' % repr(addr))
|
||||||
handler = Daemon.ConnectionHandler(sock)
|
handler = Daemon.ConnectionHandler(sock)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user