Changes in / [987:8d7201a747eb:988:371f899276ed] in freeDiameter

Files:

• extensions/dbg_interactive/dbg_interactive.c (modified) (2 diffs)
• libfdproto/log.c (modified) (1 diff)

extensions/dbg_interactive/dbg_interactive.c

@@ -36 +36 @@
 #include <Python.h>
 #include <freeDiameter/extension.h>
+#include <unistd.h>
 
 /* wrapper generated by SWIG */
@@ -61 +62 @@
         CHECK_FCT_DO(fd_core_waitstartcomplete(), goto end);
         
-        fd_log_debug("Starting interactive python interpreter [experimental].");
-        if (!arg) {
-                fd_log_debug("Example syntax:");
-                fd_log_debug("   >>> print cvar.fd_g_config.cnf_diamid");
-                fd_log_debug("   '%s'", fd_g_config->cnf_diamid);
+        if (arg) {
+                fd_log_debug("Starting python interpreter with a script file [experimental].");
+                Py_Main(2, dum);
+        } else {
+                if (!isatty(fileno(stdin)) || !isatty(fileno(stdout))) {
+                        TRACE_ERROR("[dbg_interactive]: this extension requires freeDiameter to be run from a console terminal!");
+                        goto end;
+                }
+                printf("Starting interactive python interpreter [experimental].\n");
+                printf("Example syntax:\n");
+                printf("   >>> print cvar.fd_g_config.cnf_diamid\n");
+                printf("   '%s'\n", fd_g_config->cnf_diamid);
+                Py_Main(1, dum);
         }
-        Py_Main(arg ? 2 : 1, dum);
         
 end:    

libfdproto/log.c

@@ -118 +118 @@
     }
     vfprintf(fstr, format, ap);
-    fprintf(fstr, "\n");
     if (local_use_color)
              fprintf(fstr, "\e[00m");
+    fprintf(fstr, "\n");
     
     fflush(fstr);