summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbuttle <chris@gatopelao.org>2023-08-02 20:39:24 +0200
committerbuttle <chris@gatopelao.org>2023-08-02 20:39:24 +0200
commit87b6880d7160a452fc0174e65cd6b7b07cb16110 (patch)
tree59a92f675c49d49a0809a9309e20abf84cebff57
parent11b5662e2f4bacb8854c57135644c2addd88baa9 (diff)
changes log file namefeat/logs
-rw-r--r--liberaforms/config/config.py5
-rw-r--r--liberaforms/utils/sanitizers.py2
-rw-r--r--log_listener.py4
3 files changed, 5 insertions, 6 deletions
diff --git a/liberaforms/config/config.py b/liberaforms/config/config.py
index d49de8fa..13ecf1b9 100644
--- a/liberaforms/config/config.py
+++ b/liberaforms/config/config.py
@@ -47,7 +47,7 @@ class Config(object):
"form", "forms",
"template", "templates",
"site", "sites",
- "new", "edit", "save", "update", "embed",
+ "new", "edit", "save", "update", "delete", "embed",
"api", "metrics", "feed",
"media", "file", "brand",
"data-display", "data-consent",
@@ -117,7 +117,7 @@ class Config(object):
BRAND_DIR = os.path.join(MEDIA_DIR, 'brand')
LOG_DIR = os.environ['LOG_DIR'] if 'LOG_DIR' in os.environ else "logs"
if 'FQDN' in os.environ:
- # LiberaForms cluster project requires a unique directory
+ # FQDN is set when running multiple LiberaForms apps on the same server
ATTACHMENT_DIR = os.path.join(ATTACHMENT_DIR, "hosts", os.environ['FQDN'])
MEDIA_DIR = os.path.join(MEDIA_DIR, "hosts", os.environ['FQDN'])
AVATAR_DIR = os.path.join(MEDIA_DIR, 'avatars')
@@ -138,7 +138,6 @@ class Config(object):
LDAP_RECOVER_PASSWD_URL = os.environ['LDAP_RECOVER_PASSWD_URL']
LOG_LEVEL = os.environ['LOG_LEVEL'] if 'LOG_LEVEL' in os.environ else "INFO"
LOG_SERVER_PORT = int(os.environ['LOG_SERVER_PORT']) if 'LOG_SERVER_PORT' in os.environ else 9000
- #LOG_TYPE = os.environ['LOG_TYPE'] if 'LOG_TYPE' in os.environ else "console"
class ProductionConfig(Config):
diff --git a/liberaforms/utils/sanitizers.py b/liberaforms/utils/sanitizers.py
index a4f56cce..62e215e8 100644
--- a/liberaforms/utils/sanitizers.py
+++ b/liberaforms/utils/sanitizers.py
@@ -95,8 +95,6 @@ def sanitized_slug_required(f):
@wraps(f)
def wrap(*args, **kwargs):
if 'slug' not in kwargs:
- if flask_login.current_user.is_authenticated:
- flash("No slug found!", 'error')
return render_template('main/page-not-found.html'), 404
if kwargs['slug'] in current_app.config['RESERVED_SLUGS']:
return render_template('main/page-not-found.html'), 404
diff --git a/log_listener.py b/log_listener.py
index 12b5ceb8..a2b1fadb 100644
--- a/log_listener.py
+++ b/log_listener.py
@@ -28,6 +28,8 @@ LOG_DIR = os.environ['LOG_DIR']
LOG_MAX_BYTES = 100_000_000
LOG_COPIES = 5
+os.makedirs(LOG_DIR, exist_ok=True)
+
DEFAULT_LOG_FORMAT = {
"format": "%(asctime)s %(levelname)s %(module)s:%(funcName)s %(message)s",
"datefmt": "%Y-%m-%d %H:%M:%S",
@@ -43,7 +45,7 @@ logging_conf = {
"handlers": {
"file": {
"class": "logging.handlers.RotatingFileHandler",
- "filename": f"{LOG_DIR}/{SERVER_NAME}.log",
+ "filename": f"{LOG_DIR}/{SERVER_NAME}.app.log",
"maxBytes": LOG_MAX_BYTES,
"backupCount": LOG_COPIES,
"formatter": "default"