Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -3065,11 +3065,11 @@
              (host (or (get-environment-variable "HOST") "unknown")))
         (set! *common:telemetry-log-state*
               (handle-exceptions
                exn
                (begin
-                 (debug:print-info 0 *default-log-port* "common-telemetry-log get udp port failure")
+                 (debug:print-info 0 *default-log-port* "common-telemetry-log open udp port failure")
                  'broken)
                (if (and serverhost serverport user host)
                    (let* ((s (udp-open-socket)))
                      ;;(udp-bind! s #f 0)
                      (udp-connect! s serverhost serverport)
@@ -3078,31 +3078,41 @@
                    'not-needed))))))
   
 (define (common:telemetry-log event #!key (payload '()))
   (if (eq? *common:telemetry-log-state* 'startup)
       (common:telemetry-log-open))
-  (handle-exceptions
-   exn
-   (begin
-     (debug:print-info 0 *default-log-port* "common-telemetry-log failure"))
-   (if (and *common:telemetry-log-socket* event)
-       (let* ((user (or (get-environment-variable "USER") "unknown"))
-              (host (or (get-environment-variable "HOST") "unknown"))
-              (start (conc "[megatest "event"]"))
-              (toppath (or *toppath* "/dev/null"))
-              (payload-serialized
-               (base64:base64-encode
-                (z3:encode-buffer
-                 (with-output-to-string (lambda () (pp payload))))))
-              (msg     (conc user":"host":"start":"(current-process-id)":"(car (argv))":"
-                             toppath":"payload-serialized)))
-         (udp-send *common:telemetry-log-socket* msg)))))
-
-(define (common:telemetry-log-close)
-  (when (and (eq? *common:telemetry-log-state* 'open) *common:telemetry-log-socket*)
-    (handle-exceptions
-     exn
-     (begin
-       (debug:print-info 0 *default-log-port* "common-telemetry-log closure failure"))
-     (begin
+
+  (if (eq? 'open *common:telemetry-log-state*)
+      (handle-exceptions
+       exn
+       (begin
+         (debug:print-info 0 *default-log-port* "common-telemetry-log comms failure ; disabled (no server?)")
+         ;;(define *common:telemetry-log-state* 'broken-or-no-server-preclose)
+         ;;(common:telemetry-log-close)
+         (define *common:telemetry-log-state* 'broken-or-no-server)
+         (set! *common:telemetry-log-socket* #f)
+         )
+       (if (and *common:telemetry-log-socket* event)
+           (let* ((user (or (get-environment-variable "USER") "unknown"))
+                  (host (or (get-environment-variable "HOST") "unknown"))
+                  (start (conc "[megatest "event"]"))
+                  (toppath (or *toppath* "/dev/null"))
+                  (payload-serialized
+                   (base64:base64-encode
+                    (z3:encode-buffer
+                     (with-output-to-string (lambda () (pp payload))))))
+                  (msg     (conc user":"host":"start":"(current-process-id)":"(car (argv))":"
+                                 toppath":"payload-serialized)))
+             (udp-send *common:telemetry-log-socket* msg))))))
+  
+(define (common:telemetry-log-close)
+  (when (or (member *common:telemetry-log-state* '(broken-or-no-server-preclose open)) *common:telemetry-log-socket*)
+    (handle-exceptions
+     exn
+     (begin
+       (define *common:telemetry-log-state* 'closed-fail)
+       (debug:print-info 0 *default-log-port* "common-telemetry-log closure failure")
+       )
+     (begin
+       (define *common:telemetry-log-state* 'closed)
        (udp-close-socket *common:telemetry-log-socket*)
        (set! *common:telemetry-log-socket* #f)))))