chunzhi/comfyui-deploy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: ensure logs are disabled by default

Browse Source
This commit is contained in:
bennykok 2024-01-30 15:17:25 +08:00
parent 81bde40aeb
commit 2193dd287d
2 changed files with 49 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
custom_routes.py
View File

@ -26,6 +26,7 @@ import threading
api = None api = None
api_task = None api_task = None
prompt_metadata = {} prompt_metadata = {}
cd_enable_log = os.environ.get('CD_ENABLE_LOG', 'false').lower() == 'true'
def post_prompt(json_data): def post_prompt(json_data):
prompt_server = server.PromptServer.instance prompt_server = server.PromptServer.instance
@ -157,6 +158,8 @@ async def websocket_handler(request):
try: try:
# Send initial state to the new client # Send initial state to the new client
await send("status", { 'sid': sid }, sid) await send("status", { 'sid': sid }, sid)
if cd_enable_log:
await send_first_time_log(sid) await send_first_time_log(sid)
async for msg in ws: async for msg in ws:
@ -480,4 +483,5 @@ def run_in_new_thread(coroutine):
t.start() t.start()
asyncio.run_coroutine_threadsafe(coroutine, new_loop) asyncio.run_coroutine_threadsafe(coroutine, new_loop)
run_in_new_thread(watch_file_changes(log_file_path, send_logs_to_websocket)) if cd_enable_log:
run_in_new_thread(watch_file_changes(log_file_path, send_logs_to_websocket))

25
prestartup_script.py
View File

@ -7,12 +7,19 @@ import threading
import logging import logging
from logging.handlers import RotatingFileHandler from logging.handlers import RotatingFileHandler
handler = RotatingFileHandler('comfy-deploy.log', maxBytes=500000, backupCount=5) # Running with export CD_ENABLE_LOG=true; python main.py
original_stdout = sys.stdout # Check for 'cd-enable-log' flag in input arguments
original_stderr = sys.stderr # cd_enable_log = '--cd-enable-log' in sys.argv
cd_enable_log = os.environ.get('CD_ENABLE_LOG', 'false').lower() == 'true'
class StreamToLogger(): def setup():
handler = RotatingFileHandler('comfy-deploy.log', maxBytes=500000, backupCount=5)
original_stdout = sys.stdout
original_stderr = sys.stderr
class StreamToLogger():
def __init__(self, log_level): def __init__(self, log_level):
self.log_level = log_level self.log_level = log_level
@ -43,9 +50,13 @@ class StreamToLogger():
elif (self.log_level == logging.ERROR): elif (self.log_level == logging.ERROR):
original_stderr.flush() original_stderr.flush()
# Redirect stdout and stderr to the logger # Redirect stdout and stderr to the logger
sys.stdout = StreamToLogger(logging.INFO) sys.stdout = StreamToLogger(logging.INFO)
sys.stderr = StreamToLogger(logging.ERROR) sys.stderr = StreamToLogger(logging.ERROR)
if cd_enable_log:
print("** Comfy Deploy logging enabled")
setup()
try: try:
# Get the absolute path of the script's directory # Get the absolute path of the script's directory