mirror of
https://github.com/EDCD/EDMarketConnector.git
synced 2025-04-13 07:47:14 +03:00
dashboard, hotkey, protocol: Use EDMCLogging.get_main_logger()
It does the EDMC/EDMarketConnector check.
This commit is contained in:
parent
9be7f14573
commit
abfde73362
12
dashboard.py
12
dashboard.py
@ -1,18 +1,12 @@
|
||||
import json
|
||||
import logging
|
||||
from calendar import timegm
|
||||
from os import getenv
|
||||
from os.path import isdir, isfile, join, getsize
|
||||
from sys import platform
|
||||
import time
|
||||
|
||||
from config import appcmdname, appname, config
|
||||
from config import config
|
||||
from EDMCLogging import get_main_logger
|
||||
|
||||
if getenv("EDMC_NO_UI"):
|
||||
logger = logging.getLogger(appcmdname)
|
||||
|
||||
else:
|
||||
logger = logging.getLogger(appname)
|
||||
logger = get_main_logger()
|
||||
|
||||
if platform=='darwin':
|
||||
from watchdog.observers import Observer
|
||||
|
11
hotkey.py
11
hotkey.py
@ -1,17 +1,12 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import logging
|
||||
from os import getenv
|
||||
from os.path import join
|
||||
from sys import platform
|
||||
|
||||
from config import appcmdname, appname, config
|
||||
from config import config
|
||||
from EDMCLogging import get_main_logger
|
||||
|
||||
if getenv("EDMC_NO_UI"):
|
||||
logger = logging.getLogger(appcmdname)
|
||||
|
||||
else:
|
||||
logger = logging.getLogger(appname)
|
||||
logger = get_main_logger()
|
||||
|
||||
if platform == 'darwin':
|
||||
|
||||
|
12
protocol.py
12
protocol.py
@ -1,19 +1,13 @@
|
||||
# edmc: protocol handler for cAPI authorisation
|
||||
|
||||
|
||||
import logging
|
||||
import threading
|
||||
import urllib.request, urllib.error, urllib.parse
|
||||
import sys
|
||||
from os import getenv
|
||||
|
||||
from config import appname, appcmdname
|
||||
from EDMCLogging import get_main_logger
|
||||
|
||||
if getenv("EDMC_NO_UI"):
|
||||
logger = logging.getLogger(appcmdname)
|
||||
|
||||
else:
|
||||
logger = logging.getLogger(appname)
|
||||
logger = get_main_logger()
|
||||
|
||||
if sys.platform == 'win32':
|
||||
from ctypes import *
|
||||
@ -254,7 +248,7 @@ else: # Linux / Run from source
|
||||
else:
|
||||
logger.debug('No thread')
|
||||
|
||||
logger.debug('Done')
|
||||
logger.debug('Done.')
|
||||
|
||||
def worker(self):
|
||||
self.httpd.serve_forever()
|
||||
|
Loading…
x
Reference in New Issue
Block a user