mirror/maloja
1
0
Fork 0
mirror of https://github.com/krateng/maloja.git synced 2023-08-10 21:12:55 +03:00
Code Issues Projects Releases Wiki Activity

Added setting for file logging (GH-19)

Browse Source
This commit is contained in:
Krateng 2020-06-13 17:34:30 +02:00
parent d551513733
commit 6658165bae
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maloja/__pkginfo__.py
View File

@ -5,7 +5,7 @@ author = {
"email":"maloja@krateng.dev", "email":"maloja@krateng.dev",
"github": "krateng" "github": "krateng"
} }
version = 2,4,11 version = 2,4,12
versionstr = ".".join(str(n) for n in version) versionstr = ".".join(str(n) for n in version)
links = { links = {
"pypi":"malojaserver", "pypi":"malojaserver",
@ -15,7 +15,7 @@ links = {
requires = [ requires = [
"bottle>=0.12.16", "bottle>=0.12.16",
"waitress>=1.3", "waitress>=1.3",
"doreah>=1.5.6", "doreah>=1.6.3",
"nimrodel>=0.6.3", "nimrodel>=0.6.3",
"setproctitle>=1.1.10", "setproctitle>=1.1.10",
"wand>=0.5.4", "wand>=0.5.4",

1
maloja/data_files/settings/default.ini
View File

@ -70,3 +70,4 @@ FEDERATION = yes #does nothing yet
UPDATE_AFTER_CRASH = no #update when server is automatically restarted UPDATE_AFTER_CRASH = no #update when server is automatically restarted
DAILY_RESTART = 2 # hour of day. no / none means no daily restarts DAILY_RESTART = 2 # hour of day. no / none means no daily restarts
SKIP_SETUP = no SKIP_SETUP = no
LOGGING = true

11
maloja/globalconf.py
View File

@ -37,9 +37,6 @@ config(
pyhp={ pyhp={
"version": 2 "version": 2
}, },
logging={
"logfolder": datadir("logs")
},
settings={ settings={
"files":[ "files":[
datadir("settings/default.ini"), datadir("settings/default.ini"),
@ -58,6 +55,14 @@ config(
# because we loaded a doreah module already before setting the config, we need to to that manually # because we loaded a doreah module already before setting the config, we need to to that manually
settingsconfig._readpreconfig() settingsconfig._readpreconfig()
config(
logging={
"logfolder": datadir("logs") if get_settings("LOGGING") else None
}
)
settingsconfig._readpreconfig()
# thumbor # thumbor