jeongsoo commited on
Commit
ec0010c
ยท
1 Parent(s): 2289bf9
Files changed (1) hide show
  1. app/app.py +13 -16
app/app.py CHANGED
@@ -25,11 +25,10 @@ logger = logging.getLogger(__name__)
25
  load_dotenv()
26
 
27
  # ํ™˜๊ฒฝ ๋ณ€์ˆ˜ ๋กœ๋“œ ์ƒํƒœ ํ™•์ธ ๋ฐ ๋กœ๊น…
28
- # ํ™˜๊ฒฝ ๋ณ€์ˆ˜ ๋กœ๋“œ ์ƒํƒœ ํ™•์ธ ๋ฐ ๋กœ๊น… (17-20๋ฒˆ์งธ ์ค„ ๊ทผ์ฒ˜)
29
  ADMIN_USERNAME = os.getenv('ADMIN_USERNAME')
30
  ADMIN_PASSWORD = os.getenv('ADMIN_PASSWORD')
31
 
32
- # ์žฅ์น˜ ์„œ๋ฒ„ URL ํ™˜๊ฒฝ ๋ณ€์ˆ˜ ์ถ”๊ฐ€ (์—ฌ๊ธฐ์— ์ถ”๊ฐ€)
33
  DEVICE_SERVER_URL = os.getenv('DEVICE_SERVER_URL', 'http://localhost:5050')
34
  logger.info(f"์žฅ์น˜ ์„œ๋ฒ„ URL: {DEVICE_SERVER_URL}")
35
 
@@ -164,15 +163,13 @@ def internal_error(e):
164
  # --- ์˜ค๋ฅ˜ ํ•ธ๋“ค๋Ÿฌ ๋ ---
165
 
166
  # --- ์žฅ์น˜ ๊ด€๋ จ ๋ผ์šฐํŠธ ๋“ฑ๋ก ---
167
- def register_device_routes():
168
- """Flask ์•ฑ์— ์žฅ์น˜ ๊ด€๋ จ ๋ผ์šฐํŠธ ๋“ฑ๋ก"""
169
- try:
170
- from app.app_device_routes import register_device_routes
171
- # ์ „์—ญ ๋ณ€์ˆ˜ DEVICE_SERVER_URL ์‚ฌ์šฉ
172
- register_device_routes(app, login_required, DEVICE_SERVER_URL)
173
- logger.info("์žฅ์น˜ ๊ด€๋ จ ๋ผ์šฐํŠธ ๋“ฑ๋ก ์™„๋ฃŒ")
174
- except Exception as e:
175
- logger.error(f"์žฅ์น˜ ๊ด€๋ จ ๋ผ์šฐํŠธ ๋“ฑ๋ก ์‹คํŒจ: {e}", exc_info=True)
176
  # --- ์žฅ์น˜ ๊ด€๋ จ ๋ผ์šฐํŠธ ๋“ฑ๋ก ๋ ---
177
 
178
 
@@ -368,11 +365,11 @@ def background_init():
368
  logger.warning("์ดˆ๊ธฐํ™” ์ค‘ ์˜ค๋ฅ˜๊ฐ€ ๋ฐœ์ƒํ–ˆ์ง€๋งŒ Mock ๊ฐ์ฒด๋กœ ๋Œ€์ฒด ํ›„ ์•ฑ ์‚ฌ์šฉ ๊ฐ€๋Šฅ ์ƒํƒœ๋กœ ์„ค์ •.")
369
 
370
  finally:
371
- # ์ตœ์ข…์ ์œผ๋กœ app_ready ์ƒํƒœ ์—…๋ฐ์ดํŠธ
372
- app_ready = temp_app_ready
373
-
374
- # ์žฅ์น˜ ๋ผ์šฐํŠธ ๋“ฑ๋ก (app์ด ์ค€๋น„๋˜๋ฉด)
375
- register_device_routes()
376
 
377
  # ๋ฐฑ๊ทธ๋ผ์šด๋“œ ์Šค๋ ˆ๋“œ ์‹œ์ž‘ ๋ถ€๋ถ„์€ ๊ทธ๋Œ€๋กœ ์œ ์ง€
378
  init_thread = threading.Thread(target=background_init)
 
25
  load_dotenv()
26
 
27
  # ํ™˜๊ฒฝ ๋ณ€์ˆ˜ ๋กœ๋“œ ์ƒํƒœ ํ™•์ธ ๋ฐ ๋กœ๊น…
 
28
  ADMIN_USERNAME = os.getenv('ADMIN_USERNAME')
29
  ADMIN_PASSWORD = os.getenv('ADMIN_PASSWORD')
30
 
31
+ # ์žฅ์น˜ ์„œ๋ฒ„ URL ํ™˜๊ฒฝ ๋ณ€์ˆ˜ ์ถ”๊ฐ€
32
  DEVICE_SERVER_URL = os.getenv('DEVICE_SERVER_URL', 'http://localhost:5050')
33
  logger.info(f"์žฅ์น˜ ์„œ๋ฒ„ URL: {DEVICE_SERVER_URL}")
34
 
 
163
  # --- ์˜ค๋ฅ˜ ํ•ธ๋“ค๋Ÿฌ ๋ ---
164
 
165
  # --- ์žฅ์น˜ ๊ด€๋ จ ๋ผ์šฐํŠธ ๋“ฑ๋ก ---
166
+ try:
167
+ from app.app_device_routes import register_device_routes
168
+ # ์ „์—ญ ๋ณ€์ˆ˜ DEVICE_SERVER_URL ์‚ฌ์šฉ
169
+ register_device_routes(app, login_required, DEVICE_SERVER_URL)
170
+ logger.info("์žฅ์น˜ ๊ด€๋ จ ๋ผ์šฐํŠธ ๋“ฑ๋ก ์™„๋ฃŒ")
171
+ except Exception as e:
172
+ logger.error(f"์žฅ์น˜ ๊ด€๋ จ ๋ผ์šฐํŠธ ๋“ฑ๋ก ์‹คํŒจ: {e}", exc_info=True)
 
 
173
  # --- ์žฅ์น˜ ๊ด€๋ จ ๋ผ์šฐํŠธ ๋“ฑ๋ก ๋ ---
174
 
175
 
 
365
  logger.warning("์ดˆ๊ธฐํ™” ์ค‘ ์˜ค๋ฅ˜๊ฐ€ ๋ฐœ์ƒํ–ˆ์ง€๋งŒ Mock ๊ฐ์ฒด๋กœ ๋Œ€์ฒด ํ›„ ์•ฑ ์‚ฌ์šฉ ๊ฐ€๋Šฅ ์ƒํƒœ๋กœ ์„ค์ •.")
366
 
367
  finally:
368
+ # ์ตœ์ข…์ ์œผ๋กœ app_ready ์ƒํƒœ ์—…๋ฐ์ดํŠธ
369
+ app_ready = temp_app_ready
370
+
371
+ # ์žฅ์น˜ ๋ผ์šฐํŠธ ๋“ฑ๋ก (app์ด ์ค€๋น„๋˜๋ฉด) - ์ด ๋ถ€๋ถ„ ์ œ๊ฑฐ
372
+ register_device_routes()
373
 
374
  # ๋ฐฑ๊ทธ๋ผ์šด๋“œ ์Šค๋ ˆ๋“œ ์‹œ์ž‘ ๋ถ€๋ถ„์€ ๊ทธ๋Œ€๋กœ ์œ ์ง€
375
  init_thread = threading.Thread(target=background_init)