CGI some small fixes to Logging

diff --git a/a.sh b/a.sh
index a74fd67ba92a6bc03d686fd6651ffb1bfbb30e78..772052e2d4c2884a67c8d0d145ad77bf2c98387f 100755 (executable)
--- a/a.sh
+++ b/a.sh
@@ -14,8 +14,10 @@ echo "GEMINI_URL_PATH=$GEMINI_URL_PATH"
 echo "REMOTE_ADDR=$REMOTE_ADDR"
 echo "REMOTE_HOST=$REMOTE_HOST"
 echo "REMOTE_PORT=$REMOTE_PORT"
-echo "QUERY_STRING=$QUERY_STRING"
-echo "GEMINI_QUERY_STRING=$GEMINI_QUERY_STRING"
+echo "QUERY_STRING="
+echo "$QUERY_STRING" | tr '&' '\n' | sed 's/^/- /' | sed 's/=/ → /g'
+echo "GEMINI_QUERY_STRING="
+echo "$GEMINI_QUERY_STRING" | tr '&' '\n' | sed 's/^/- /' | sed 's/=/ → /g'
 echo "AUTH_TYPE=$AUTH_TYPE"
 echo "REMOTE_USER=$REMOTE_USER"
 echo "REMOTE_IDENT=$REMOTE_IDENT"

diff --git a/cgi.pl b/cgi.pl
index d8b99e0840c1c23764ea5b4119b74a88ce7fa75e..17100a4020602790f8bd5102b5dedf09fa0a68f9 100644 (file)
--- a/cgi.pl
+++ b/cgi.pl
@@ -22,7 +22,9 @@ run_cgi_(Script, Uri, TcpClient, TlsClientCert, Output) :-
     append([Env0, Env1, Env2, Env3, Env4], Env),
     process_create(Script, [], [stdout(pipe(P)), environment(Env), process(H)]),
     process_wait(H, exit(N)),
-    ( N #\= 0, throw(gemini_error(cgi_error, "CGI exited with non-zero exit code!"))
+    ( N #\= 0,
+        log_msg("error", "CGI exited with non-zero exit code!", []),
+        throw(cgi_error)
     ; phrase_from_stream(seq(Output), P)
     ).
 

diff --git a/routing.pl b/routing.pl
index cff1cc0cc35525af501b2e611231926fa8b3391a..e286b160b3946f21b08ff42c8e13987dddfb3204 100644 (file)
--- a/routing.pl
+++ b/routing.pl
@@ -42,8 +42,6 @@ routing_(S, TcpClient, TlsClientCert, Uri) :-
           ; content(Root),
             serve(S, Root, Uri)
           ),
-          Err,
-          ( log_msg("error", "Internal server error: ~q", [Err]),
-            throw(gemini_error(permanent_failure, "Internal server error"))
-          )
+          _,
+          throw(gemini_error(permanent_failure, "Internal server error"))
          ).