make plproxy_error survive NULL, also avoid NULL func if possible

diff --git a/src/execute.c b/src/execute.c
index 592f07f0e21504eecae3bfdb723e75fde36d7644..31f48137645ab3e712bf06f38037b320e305d583 100644 (file)
--- a/src/execute.c
+++ b/src/execute.c
@@ -237,7 +237,7 @@ intr_loop:
        {
                if (errno == EINTR)
                        goto intr_loop;
-               plproxy_error(NULL, "check_old_conn: select failed: %s",
+               plproxy_error(func, "check_old_conn: select failed: %s",
                                          strerror(errno));
        }
 

diff --git a/src/main.c b/src/main.c
index 0b92ee0442a1cf4f4817f4d0e8f2768ab30e9bf1..fdeb99c02df99e3af1147fb80ab3cd4768b837a1 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -75,8 +75,11 @@ plproxy_error(ProxyFunction *func, const char *fmt,...)
 
        plproxy_clean_results(func->cur_cluster);
 
-       elog(ERROR, "PL/Proxy function %s(%d): %s",
-                func->name, func->arg_count, msg);
+       if (func)
+               elog(ERROR, "PL/Proxy function %s(%d): %s",
+                        func->name, func->arg_count, msg);
+       else
+               elog(ERROR, "PL/Proxy error: %s", msg);
 }
 
 /*