Show fastcgi socket in backend log, don't show source file/line for backend logs

include/lighttpd/log.h

@@ -27,9 +27,9 @@
 	li_log_write_(srv, vr, LI_LOG_LEVEL_DEBUG, LOG_FLAG_TIMESTAMP, "(debug) %s.%d: "fmt, LI_REMOVE_PATH(__FILE__), __LINE__, __VA_ARGS__)
 
 #define _BACKEND(srv, vr, fmt, ...) \
-	li_log_write_(srv, vr, LI_LOG_LEVEL_BACKEND, LOG_FLAG_TIMESTAMP, "(backend) %s.%d: "fmt, LI_REMOVE_PATH(__FILE__), __LINE__, __VA_ARGS__)
+	li_log_write_(srv, vr, LI_LOG_LEVEL_BACKEND, LOG_FLAG_TIMESTAMP, fmt, __VA_ARGS__)
 #define _BACKEND_LINES(srv, vr, txt, fmt, ...) \
-	li_log_split_lines_(srv, vr, LI_LOG_LEVEL_BACKEND, LOG_FLAG_TIMESTAMP, txt, "(backend) %s.%d: "fmt, LI_REMOVE_PATH(__FILE__), __LINE__, __VA_ARGS__)
+	li_log_split_lines_(srv, vr, LI_LOG_LEVEL_BACKEND, LOG_FLAG_TIMESTAMP, txt, fmt, __VA_ARGS__)
 
 #define _GERROR(srv, vr, error, fmt, ...) \
 	li_log_write_(srv, vr, LI_LOG_LEVEL_ERROR, LOG_FLAG_TIMESTAMP, "(error) %s.%d: " fmt "\n  %s", LI_REMOVE_PATH(__FILE__), __LINE__, __VA_ARGS__, error ? error->message : "Empty GError")

src/modules/mod_fastcgi.c

@@ -85,6 +85,7 @@ struct fastcgi_connection {
 struct fastcgi_context {
 	gint refcount;
 	liSocketAddress socket;
+	GString *socket_str;
 	guint timeout;
 	liPlugin *plugin;
 };
@@ -141,6 +142,7 @@ static fastcgi_context* fastcgi_context_new(liServer *srv, liPlugin *p, GString
 	ctx->socket = saddr;
 	ctx->timeout = 5;
 	ctx->plugin = p;
+	ctx->socket_str = g_string_new_len(GSTR_LEN(dest_socket));
 	return ctx;
 }
 
@@ -149,6 +151,7 @@ static void fastcgi_context_release(fastcgi_context *ctx) {
 	assert(g_atomic_int_get(&ctx->refcount) > 0);
 	if (g_atomic_int_dec_and_test(&ctx->refcount)) {
 		li_sockaddr_clear(&ctx->socket);
+		g_string_free(ctx->socket_str, TRUE);
 		g_slice_free(fastcgi_context, ctx);
 	}
 }
@@ -536,7 +539,7 @@ static gboolean fastcgi_parse_response(fastcgi_connection *fcon) {
 			if (FASTCGI_OPTION(FASTCGI_OPTION_LOG_PLAIN_ERRORS).boolean) {
 				li_log_split_lines(vr->wrk->srv, vr, LI_LOG_LEVEL_BACKEND, 0, vr->wrk->tmp_str->str, "");
 			} else {
-				VR_BACKEND_LINES(vr, vr->wrk->tmp_str->str, "%s", "(fcgi-stderr) ");
+				VR_BACKEND_LINES(vr, vr->wrk->tmp_str->str, "(fcgi-stderr %s) ", fcon->ctx->socket_str->str);
 			}
 			li_chunkqueue_skip(fcon->fcgi_in, len);
 			break;