From 08f7d267b8cb747a716a42160611f005699b3ed4 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 1 Dec 2019 17:16:12 +0100 Subject: [PATCH 1/2] version 3.22 is released --- src/kernel/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kernel/version.c b/src/kernel/version.c index e0eda3631..756eb3be5 100644 --- a/src/kernel/version.c +++ b/src/kernel/version.c @@ -8,7 +8,7 @@ #ifndef ERESSEA_VERSION /* the version number, if it was not passed to make with -D */ -#define ERESSEA_VERSION "3.21.0" +#define ERESSEA_VERSION "3.22.0" #endif const char *eressea_version(void) { From face5eeb31ff7c24475e89b1f4f5c5868ebc0a77 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Mon, 23 Dec 2019 15:20:39 +0100 Subject: [PATCH 2/2] increase maxfiles to 50, handle error when no file generated. --- process/accept-orders.py | 2 +- process/orders-accept | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/process/accept-orders.py b/process/accept-orders.py index 5a7124d43..7c22df8fc 100755 --- a/process/accept-orders.py +++ b/process/accept-orders.py @@ -52,7 +52,7 @@ hostname = socket.gethostname() orderbase = "orders.dir" sendmail = True # maximum number of reports per sender: -maxfiles = 30 +maxfiles = 50 # write headers to file? writeheaders = True # reject all html email? diff --git a/process/orders-accept b/process/orders-accept index dfadb3aea..b1e87eb1d 100755 --- a/process/orders-accept +++ b/process/orders-accept @@ -17,10 +17,13 @@ mkdir -p orders.dir cd orders.dir lockfile -r3 -l120 "$LOCKFILE" eval "$(python "$BIN/accept-orders.py" "$@")" -rm -f "$LOCKFILE" -filename=$(basename "$ACCEPT_FILE") -email="$ACCEPT_MAIL" -if [ -d "$ERESSEA/orders-php" ] +if [ -e "$ACCEPT_FILE" ] then - php "$ERESSEA/orders-php/cli.php" insert "$filename" "$lang" "$email" + rm -f "$LOCKFILE" + filename=$(basename "$ACCEPT_FILE") + email="$ACCEPT_MAIL" + if [ -d "$ERESSEA/orders-php" ] + then + php "$ERESSEA/orders-php/cli.php" insert "$filename" "$lang" "$email" + fi fi