Made hubmgr daemonizable.

[doldaconnect.git] / lib / guile / hubmgr

diff --git a/lib/guile/hubmgr b/lib/guile/hubmgr
index 94b0e3f..dd15213 100755 (executable)
--- a/lib/guile/hubmgr
+++ b/lib/guile/hubmgr
@@ -1,8 +1,25 @@
 #!/usr/bin/guile -s
 !#
 
+;  Dolda Connect - Modular multiuser Direct Connect-style client
+;  Copyright (C) 2007 Fredrik Tolf <fredrik@dolda2000.com>
+;  
+;  This program is free software; you can redistribute it and/or modify
+;  it under the terms of the GNU General Public License as published by
+;  the Free Software Foundation; either version 2 of the License, or
+;  (at your option) any later version.
+;  
+;  This program is distributed in the hope that it will be useful,
+;  but WITHOUT ANY WARRANTY; without even the implied warranty of
+;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;  GNU General Public License for more details.
+;  
+;  You should have received a copy of the GNU General Public License
+;  along with this program; if not, write to the Free Software
+;  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
 (use-modules (dolcon ui) (dolcon util))
-(use-modules (ice-9 format))
+(use-modules (ice-9 format) (ice-9 rdelim) (ice-9 getopt-long))
 
 (define max-hubs 6)
 (define hub-list '())
@@ -10,10 +27,12 @@
 (define hublist '())
 (define connlist '())
 (define statelist '())
+(define logdest #t)
 
 (define (logf . args)
   (let ((fmt (car args)) (args (cdr args)))
-    (apply format (cons* #t (string-append fmt "~%") args))))
+    (if logdest
+       (apply format (cons* logdest (string-append fmt "~%") args)))))
 
 (define (list-delta l1 l2)
   (let ((r1 '()) (r2 '()))
@@ -68,18 +87,19 @@
                                            (begin (set-cdr! (assq hub connlist) (car ir))
                                                   (logf "~a state syn (~a)" (cadr hub) (car ir)))
                                            (begin (set! connlist (delq (assq hub connlist) connlist))
+                                                  (set! statelist (cons (list hub (current-time) 10) statelist))
                                                   (logf "~a failed (~a)" (cadr hub) (cdr (assq 'code er))))))))))))
            hublist))
 
 (define (hubmgr-main args)
-  (let ((dc-server #f))
-    (if (not dc-server) (set! dc-server (getenv "DCSERVER")))
-    (if (not dc-server) (set! dc-server "localhost"))
+  (let ((opts (getopt-long args '((daemon (single-char #\d) (value #f))
+                                 (server (single-char #\s) (value #t))))))
     
     (set! hublist (read-hl))
     (logf "read ~a hubs" (length hublist))
-    (dc-c&l #t dc-server #t)
+    (dc-c&l #t (option-ref opts 'server #f) #t)
     (dc-ecmd-assert 200 "notify" "fn:act" "on")
+    (dc-ecmd-assert 200 "register" "hubmgr")
     (dc-handle-fn)
     (dc-fnproc-reg 'state (lambda (fn)
                            (if (and (eq? (cdr (assq 'state fn)) 'dead)
@@ -97,6 +117,11 @@
                           (cklist)))
     (dc-loop-reg ".periodic" #f cklist)
     
+    (if (and (option-ref opts 'daemon #f)
+            (not (= (primitive-fork) 0)))
+       (primitive-exit 0)
+       (set! logdest #f))
+    
     (cklist)
     (dc-loop)))