Fix directories
This commit is contained in:
parent
bdddf58712
commit
d8b06a28bb
3 changed files with 3 additions and 3 deletions
|
@ -686,7 +686,7 @@ class UiWebsocketPlugin(object):
|
||||||
if sys.platform == "linux":
|
if sys.platform == "linux":
|
||||||
sys_db_paths += ['/usr/share/GeoIP/' + db_name]
|
sys_db_paths += ['/usr/share/GeoIP/' + db_name]
|
||||||
|
|
||||||
data_dir_db_path = config.data_dir / db_name
|
data_dir_db_path = config.start_dir / db_name
|
||||||
|
|
||||||
db_paths = sys_db_paths + [data_dir_db_path]
|
db_paths = sys_db_paths + [data_dir_db_path]
|
||||||
|
|
||||||
|
|
|
@ -153,7 +153,7 @@ content_dbs = {}
|
||||||
|
|
||||||
def getContentDb(path=None):
|
def getContentDb(path=None):
|
||||||
if not path:
|
if not path:
|
||||||
path = config.data_dir / 'content.db'
|
path = config.start_dir / 'content.db'
|
||||||
if path not in content_dbs:
|
if path not in content_dbs:
|
||||||
content_dbs[path] = ContentDb(path)
|
content_dbs[path] = ContentDb(path)
|
||||||
content_dbs[path].init()
|
content_dbs[path].init()
|
||||||
|
|
|
@ -129,7 +129,7 @@ def init():
|
||||||
if config.action == "main":
|
if config.action == "main":
|
||||||
from util import helper
|
from util import helper
|
||||||
try:
|
try:
|
||||||
lock = helper.openLocked(config.data_dir / 'lock.pid', "w")
|
lock = helper.openLocked(config.start_dir / 'lock.pid', "w")
|
||||||
lock.write(f"{os.getpid()}")
|
lock.write(f"{os.getpid()}")
|
||||||
except BlockingIOError as err:
|
except BlockingIOError as err:
|
||||||
startupError(f"Can't open lock file, your 0net client is probably already running, exiting... ({err})")
|
startupError(f"Can't open lock file, your 0net client is probably already running, exiting... ({err})")
|
||||||
|
|
Loading…
Reference in a new issue