From fa18dce549ca401e4e95faed83243ba6137c2ea4 Mon Sep 17 00:00:00 2001
From: yumoqing <yumoqing@gmail.com>
Date: Tue, 12 Nov 2024 14:29:32 +0800
Subject: [PATCH] bugfix

---
 ahserver/__pycache__/__init__.cpython-312.pyc | Bin 140 -> 139 bytes
 ahserver/__pycache__/version.cpython-312.pyc  | Bin 165 -> 164 bytes
 ahserver/webapp.py                            |  31 ++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 ahserver/webapp.py

diff --git a/ahserver/__pycache__/__init__.cpython-312.pyc b/ahserver/__pycache__/__init__.cpython-312.pyc
index 2a0fec91b504baae7d8048bddc33b624e748de5d..2ecb91afb25ab4cf0933680ae6a2ce6c5f28653d 100644
GIT binary patch
delta 30
kcmeBS>}KRS&CAQh00iZm1=1(-7_n*TrzDmnPIPq#0BUpxn*aa+

delta 31
lcmeBX>|x|N&CAQh00h@2m!wSOF=E%&4=qkDDxT=#4gh^|2($nI

diff --git a/ahserver/__pycache__/version.cpython-312.pyc b/ahserver/__pycache__/version.cpython-312.pyc
index eb540e48a12121d61144bfc72e8f45d92cccf416..54f97e78d5818f4ca5a7bab25834036bbbc3ed13 100644
GIT binary patch
delta 30
kcmZ3=xP+1CG%qg~0}zyN7D%7S<Ibk3pORRTI5El_0C6e@`Tzg`

delta 31
lcmZ3&xRjCSG%qg~0}x!BT#_=8$DLhEKeRZtsCZ(eHvoif2@?PS

diff --git a/ahserver/webapp.py b/ahserver/webapp.py
new file mode 100644
index 0000000..fa1ed9b
--- /dev/null
+++ b/ahserver/webapp.py
@@ -0,0 +1,31 @@
+import os, sys
+import argparse
+from appPublic.log import MyLogger, info, debug, warning
+from appPublic.folderUtils import ProgramPath
+from appPublic.jsonConfig import getConfig
+from ahserver.configuredServer import ConfiguredServer
+from ahserver.serverenv import ServerEnv
+		
+def webapp(init_func):
+	parser = argparse.ArgumentParser(prog="Sage")
+	parser.add_argument('-w', '--workdir')
+	parser.add_argument('-p', '--port')
+	args = parser.parse_args()
+	workdir = args.workdir or os.getcwd()
+	p = ProgramPath()
+	config = getConfig(workdir, NS={'workdir':workdir, 'ProgramPath':p})
+	if config.logger:
+		logger = MyLogger(config.logger.name or 'webapp',
+							levelname=config.logger.levelname or 'info',
+							logfile=config.logger.logfile or None)
+	else:
+		logger = MyLogger('webapp', levelname='info')
+	init_func()
+	server = ConfiguredServer(workdir=workdir)
+	port = args.port or config.website.port or 8080
+	port = int(port)
+	server.run(port=port)
+
+if __name__ == '__main__':
+	from main import main
+	webapp(main)