Configurable global prefix for log lines

conf/janus.jcfg.sample.in

@@ -18,6 +18,11 @@ general: {
 	#debug_timestamps = true				# Whether to show a timestamp for each log line
 	#debug_colors = false					# Whether colors should be disabled in the log
 	#debug_locks = true						# Whether to enable debugging of locks (very verbose!)
+	#log_prefix = "[janus] "				# In case you want log lines to be prefixed by some
+											# custom text, you can use the 'log_prefix' property.
+											# It supports terminal colors, meaning something like
+											# "[\x1b[32mjanus\x1b[0m] " would show a green "janus"
+											# string in square brackets (assuming debug_colors=true).
 
 		# This is what you configure if you want to launch Janus as a daemon
 	#daemonize = true						# Whether Janus should run as a daemon

debug.h

@@ -18,6 +18,7 @@
 extern int janus_log_level;
 extern gboolean janus_log_timestamps;
 extern gboolean janus_log_colors;
+extern char *janus_log_global_prefix;
 
 /** @name Janus log colors
  */
@@ -100,7 +101,8 @@ do { \
 			snprintf(janus_log_src, sizeof(janus_log_src), \
 			         "[%s:%s:%d] ", __FILE__, __FUNCTION__, __LINE__); \
 		} \
-		JANUS_PRINT("%s%s%s" format, \
+		JANUS_PRINT("%s%s%s%s" format, \
+			janus_log_global_prefix ? janus_log_global_prefix : "", \
 			janus_log_ts, \
 			janus_log_prefix[level | ((int)janus_log_colors << 3)], \
 			janus_log_src, \

fuzzers/rtcp_fuzzer.c

@@ -10,6 +10,7 @@
 int janus_log_level = LOG_NONE;
 gboolean janus_log_timestamps = FALSE;
 gboolean janus_log_colors = FALSE;
+char *janus_log_global_prefix = NULL;
 int lock_debug = 0;
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {

fuzzers/rtp_fuzzer.c

@@ -10,6 +10,7 @@
 int janus_log_level = LOG_NONE;
 gboolean janus_log_timestamps = FALSE;
 gboolean janus_log_colors = FALSE;
+char *janus_log_global_prefix = NULL;
 int lock_debug = 0;
 
 /* This is to avoid linking with openSSL */

fuzzers/sdp_fuzzer.c

@@ -10,6 +10,7 @@
 int janus_log_level = LOG_NONE;
 gboolean janus_log_timestamps = FALSE;
 gboolean janus_log_colors = FALSE;
+char *janus_log_global_prefix = NULL;
 int lock_debug = 0;
 int refcount_debug = 0;
 

janus-cfgconv.c

@@ -34,6 +34,7 @@
 int janus_log_level = 4;
 gboolean janus_log_timestamps = FALSE;
 gboolean janus_log_colors = TRUE;
+char *janus_log_global_prefix = NULL;
 int lock_debug = 0;
 
 /* Main Code */

janus.c

@@ -425,6 +425,7 @@ static json_t *janus_info(const char *transaction) {
 int janus_log_level = LOG_INFO;
 gboolean janus_log_timestamps = FALSE;
 gboolean janus_log_colors = FALSE;
+char *janus_log_global_prefix = NULL;
 int lock_debug = 0;
 #ifdef REFCOUNT_DEBUG
 int refcount_debug = 1;
@@ -3810,6 +3811,11 @@ gint main(int argc, char *argv[])
 	janus_config_category *config_events = janus_config_get_create(config, NULL, janus_config_type_category, "events");
 	janus_config_category *config_loggers = janus_config_get_create(config, NULL, janus_config_type_category, "loggers");
 
+	/* Any log prefix? */
+	janus_config_array *lp = janus_config_get(config, config_general, janus_config_type_item, "log_prefix");
+	if(lp && lp->value)
+		janus_log_global_prefix = g_strdup(lp->value);
+
 	/* Check if there are folders to protect */
 	janus_config_array *pfs = janus_config_get(config, config_general, janus_config_type_array, "protected_folders");
 	if(pfs && pfs->list) {
@@ -5203,6 +5209,7 @@ gint main(int argc, char *argv[])
 	}
 	janus_mutex_unlock(&counters_mutex);
 #endif
+	g_clear_pointer(&janus_log_global_prefix, g_free);
 
 	JANUS_PRINT("Bye!\n");
 

postprocessing/janus-pp-rec.c

@@ -113,6 +113,7 @@ Usage: janus-pp-rec [OPTIONS] source.mjr [destination.[opus|wav|webm|mp4|srt]]
 int janus_log_level = 4;
 gboolean janus_log_timestamps = FALSE;
 gboolean janus_log_colors = TRUE;
+char *janus_log_global_prefix = NULL;
 int lock_debug = 0;
 
 gboolean janus_faststart = FALSE;

postprocessing/mjr2pcap.c

@@ -49,6 +49,7 @@
 int janus_log_level = 4;
 gboolean janus_log_timestamps = FALSE;
 gboolean janus_log_colors = TRUE;
+char *janus_log_global_prefix = NULL;
 int lock_debug = 0;
 
 int working = 0;