Replace Inline::Python with a light Python function server

starcheck/server.py

@@ -1,10 +1,15 @@
 import collections
 import importlib
 import json
+import logging
 import socketserver
 import sys
 import traceback
 
+from ska_helpers.logging import basic_logger
+
+logger = basic_logger(__name__, level="INFO")
+
 HOST = "localhost"
 KEY = None
 
@@ -33,18 +38,18 @@ class MyTCPHandler(socketserver.StreamRequestHandler):
     def handle(self):
         # self.request is the TCP socket connected to the client
         data = self.rfile.readline()
-        # print(f"SERVER receive: {data.decode('utf-8')}")
+        logger.debug(f"SERVER receive: {data.decode('utf-8')}")
 
         # Decode self.data from JSON
         cmd = json.loads(data)
 
         if cmd["key"] != KEY:
-            print(f"SERVER: bad key {cmd['key']!r}")
+            logger.ERROR(f"SERVER: bad key {cmd['key']!r}")
             return
 
-        # print(f"SERVER receive func: {cmd['func']}")
-        # print(f"SERVER receive args: {cmd['args']}")
-        # print(f"SERVER receive kwargs: {cmd['kwargs']}")
+        logger.debug(f"SERVER receive func: {cmd['func']}")
+        logger.debug(f"SERVER receive args: {cmd['args']}")
+        logger.debug(f"SERVER receive kwargs: {cmd['kwargs']}")
 
         exc = None
 
@@ -69,20 +74,29 @@ def handle(self):
                 exc = traceback.format_exc()
 
         resp = json.dumps({"result": result, "exception": exc})
-        # print(f"SERVER send: {resp}")
+        logger.debug(f"SERVER send: {resp}")
 
         self.request.sendall(resp.encode("utf-8"))
 
 
 def main():
     global KEY
-
+    
     # Read a line from STDIN
     port = int(sys.stdin.readline().strip())
     KEY = sys.stdin.readline().strip()
-
-    print("SERVER: starting on port", port)
-
+    loglevel = sys.stdin.readline().strip()
+
+    logmap = {'0': logging.CRITICAL,
+              '1': logging.WARNING,
+              '2': logging.INFO}
+    if loglevel in logmap:
+        logger.setLevel(logmap[loglevel])
+    if int(loglevel) > 2:
+        logger.setLevel(logging.DEBUG)
+
+    logger.info(f"SERVER: starting on port {port}")    
+
     # Create the server, binding to localhost on supplied port
     with PythonServer((HOST, port), MyTCPHandler) as server:
         # Activate the server; this will keep running until you

starcheck/src/lib/Ska/Starcheck/Python.pm

@@ -22,15 +22,18 @@ $Data::Dumper::Terse = 1;
 my $HOST = "localhost";
 my $PORT = 40000;
 my $KEY = "fff";
+my $VERBOSE = 1;
 
 sub set_port {
     $PORT = shift;
-    print "CLIENT: Setting port to $PORT\n";
 }
 
 sub set_key {
     $KEY = shift;
-    print "CLIENT: Setting key to $KEY\n";
+}
+
+sub set_debug {
+    $VERBOSE = shift;
 }
 
 sub call_python {
@@ -47,8 +50,10 @@ sub call_python {
         "key" => $KEY,
     };
     my $command_json = encode_json $command;
-    # print "CLIENT: Sending command $command_json\n";
 
+    if ($VERBOSE gt 2){
+	print STDERR "CLIENT: Sending command $command_json\n";
+    }
     my $handle;
     my $iter = 0;
     while ($iter++ < 10) {
@@ -68,8 +73,10 @@ sub call_python {
     $handle->close();
 
     my $data = decode_json $response;
-    # print "CLIENT: Got response: $response\n";
-    # print Dumper($data);
+    if ($VERBOSE gt 2){
+	print STDERR "CLIENT: Got response: $response\n";
+	print STDERR Dumper($data);
+    }
     if (defined $data->{exception}) {
         my $msg = "\nPython exception:\n";
         $msg .= "command = " . Dumper($command) . "\n";

starcheck/src/starcheck.pl

@@ -91,13 +91,19 @@
 # Configure the Python interface
 Ska::Starcheck::Python::set_port($server_port);
 Ska::Starcheck::Python::set_key($server_key);
+Ska::Starcheck::Python::set_debug($par{verbose});
+if ($par{verbose} gt 1){
+    print STDERR "CLIENT: starcheck.server started on port $server_port\n";
+    print STDERR "CLIENT: starcheck.server key $server_key\n";
+}
 
 # Start a server that can call functions in the starcheck package
 my $pid = open(SERVER, "| python -m starcheck.server");
 SERVER->autoflush(1);
-# Send the port and key to the server
+# Send the port, key, and verbosity to the server
 print SERVER "$server_port\n";
 print SERVER "$server_key\n";
+print SERVER "$par{verbose}\n";
 
 # DEBUG, limit number of obsids.
 # Set to undef for no limit (though option defaults to 0)
@@ -1167,8 +1173,10 @@ END
 	    print("Python server calls:");
 	    print Dumper($server_calls);
 	}
-        print("Shutting down python starcheck server with pid=$pid\n");
-        kill 9, $pid;                    # must it be 9 (SIGKILL)?
+	if ($par{verbose} gt 1){
+	    print("Shutting down python starcheck server with pid=$pid\n");
+	}
+	kill 9, $pid;                    # must it be 9 (SIGKILL)?
         my $gone_pid = waitpid $pid, 0;  # then check that it's gone
     }
 };