mirror of
https://github.com/Py-KMS-Organization/py-kms.git
synced 2025-05-13 22:54:57 -04:00
add proper logger to entrypoint and start
This commit is contained in:
parent
6d7124414a
commit
5f7ef1397f
2 changed files with 40 additions and 22 deletions
|
@ -1,8 +1,10 @@
|
|||
#!/usr/bin/python3 -u
|
||||
|
||||
# This replaces the old start.sh and ensures all arguments are bound correctly from the environment variables...
|
||||
import logging
|
||||
import os
|
||||
import subprocess
|
||||
import sys
|
||||
import time
|
||||
|
||||
PYTHON3 = '/usr/bin/python3'
|
||||
|
@ -27,50 +29,45 @@ log_level = os.getenv('LOGLEVEL', 'INFO')
|
|||
def start_kms_client():
|
||||
if not os.path.isfile(dbPath):
|
||||
# Start a dummy activation to ensure the database file is created
|
||||
client_cmd = [PYTHON3,'-u', 'pykms_Client.py', os.environ.get('IP', "0.0.0.0"), os.environ.get('PORT', 1688),
|
||||
client_cmd = [PYTHON3, '-u', 'pykms_Client.py', os.environ.get('IP', "0.0.0.0"), os.environ.get('PORT', 1688),
|
||||
'-m', 'Windows10', '-n', 'DummyClient', '-c', 'ae3a27d1-b73a-4734-9878-70c949815218',
|
||||
'-V', os.environ.get('LOGLEVEL', 'INFO'), '-F', os.environ.get('LOGFILE', 'STDOUT')]
|
||||
if os.environ.get('LOGSIZE', '') != "":
|
||||
client_cmd.append('-S')
|
||||
client_cmd.append(os.environ.get('LOGSIZE'))
|
||||
|
||||
if log_level.lower() in ['info', 'debug']:
|
||||
print("Starting a dummy activation to ensure the database file is created")
|
||||
if log_level.lower() == 'debug':
|
||||
print("client_cmd: " + str(client_cmd))
|
||||
loggersrv.info("Starting a dummy activation to ensure the database file is created")
|
||||
loggersrv.debug("client_cmd: %s" % (" ".join(str(x) for x in client_cmd).strip()))
|
||||
|
||||
subprocess.run(client_cmd)
|
||||
|
||||
|
||||
def start_kms():
|
||||
sqlite_process = None
|
||||
# Build the command to execute
|
||||
command = [PYTHON3,'-u', 'pykms_Server.py', os.environ.get('IP'), os.environ.get('PORT')]
|
||||
command = [PYTHON3, '-u', 'pykms_Server.py', os.environ.get('IP'), os.environ.get('PORT')]
|
||||
for (arg, env) in argumentVariableMapping.items():
|
||||
if env in os.environ and os.environ.get(env) != '':
|
||||
command.append(arg)
|
||||
command.append(os.environ.get(env))
|
||||
|
||||
if enableSQLITE:
|
||||
print('Storing database file to ' + dbPath)
|
||||
loggersrv.info("Storing database file to %s" % dbPath)
|
||||
command.append('-s')
|
||||
command.append(dbPath)
|
||||
|
||||
if log_level.lower() == 'debug':
|
||||
print("server_cmd: " + str(command))
|
||||
|
||||
loggersrv.debug("server_cmd: %s" % (" ".join(str(x) for x in command).strip()))
|
||||
pykms_process = subprocess.Popen(command)
|
||||
|
||||
# In case SQLITE is defined: Start the web interface
|
||||
if enableSQLITE:
|
||||
time.sleep(5) # The server may take a while to start
|
||||
os.system('ls -al ' + dbPath)
|
||||
start_kms_client()
|
||||
sqlite_cmd = [PYTHON3,'-u', '/home/sqlite_web/sqlite_web.py', '-H', os.environ.get('IP'), '--read-only', '-x', dbPath,
|
||||
sqlite_cmd = [PYTHON3, '-u', '/home/sqlite_web/sqlite_web.py', '-H', os.environ.get('IP'), '--read-only', '-x',
|
||||
dbPath,
|
||||
'-p', os.environ.get('SQLITE_PORT')]
|
||||
|
||||
if log_level.lower() == 'debug':
|
||||
print("sqlite_cmd: " + str(sqlite_cmd))
|
||||
|
||||
loggersrv.debug("sqlite_cmd: %s" % (" ".join(str(x) for x in sqlite_cmd).strip()))
|
||||
sqlite_process = subprocess.Popen(sqlite_cmd)
|
||||
|
||||
try:
|
||||
|
@ -80,10 +77,18 @@ def start_kms():
|
|||
pass
|
||||
|
||||
if enableSQLITE:
|
||||
sqlite_process.terminate()
|
||||
if None != sqlite_process: sqlite_process.terminate()
|
||||
pykms_process.terminate()
|
||||
|
||||
|
||||
# Main
|
||||
if (__name__ == "__main__"):
|
||||
loggersrv = logging.getLogger('logsrv')
|
||||
loggersrv.setLevel(log_level)
|
||||
streamhandler = logging.StreamHandler(sys.stdout)
|
||||
streamhandler.setLevel(log_level)
|
||||
formatter = logging.Formatter(fmt='\x1b[94m%(asctime)s %(levelname)-8s %(message)s',
|
||||
datefmt='%a, %d %b %Y %H:%M:%S')
|
||||
streamhandler.setFormatter(formatter)
|
||||
loggersrv.addHandler(streamhandler)
|
||||
start_kms()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue