Dolda2000 GitWeb
/
doldaconnect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improvements to hubmgr.
[doldaconnect.git]
/
lib
/
guile
/
hubmgr
diff --git
a/lib/guile/hubmgr
b/lib/guile/hubmgr
index
48c2b65
..
5d8de74
100755
(executable)
--- a/
lib/guile/hubmgr
+++ b/
lib/guile/hubmgr
@@
-19,7
+19,7
@@
; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(use-modules (dolcon ui) (dolcon util))
; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(use-modules (dolcon ui) (dolcon util))
-(use-modules (ice-9 format) (ice-9 rdelim))
+(use-modules (ice-9 format) (ice-9 rdelim)
(ice-9 getopt-long)
)
(define max-hubs 6)
(define hub-list '())
(define max-hubs 6)
(define hub-list '())
@@
-27,10
+27,12
@@
(define hublist '())
(define connlist '())
(define statelist '())
(define hublist '())
(define connlist '())
(define statelist '())
+(define logdest #t)
(define (logf . args)
(let ((fmt (car args)) (args (cdr args)))
(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 '()))
(define (list-delta l1 l2)
(let ((r1 '()) (r2 '()))
@@
-77,7
+79,7
@@
(not (assq o statelist)))
(begin (logf "connecting to ~a" (cadr o))
(set! connlist (cons (cons o 'pend) connlist))
(not (assq o statelist)))
(begin (logf "connecting to ~a" (cadr o))
(set! connlist (cons (cons o 'pend) connlist))
- (dc-qcmd (
list
* "cnct" o)
+ (dc-qcmd (
cons
* "cnct" o)
(let ((hub o))
(lambda (resp)
(let ((er (dc-extract resp)) (ir (dc-intresp resp)))
(let ((hub o))
(lambda (resp)
(let ((er (dc-extract resp)) (ir (dc-intresp resp)))
@@
-90,12
+92,16
@@
hublist))
(define (hubmgr-main args)
hublist))
(define (hubmgr-main args)
- (let ((dc-server #f))
+ (let ((opts (getopt-long args '((nodaemon (single-char #\d) (value #f))
+ (server (single-char #\s) (value #t))
+ (quiet (single-char #\q) (value #f))))))
+ (if (option-ref opts 'quiet #f) (set! logdest #f))
(set! hublist (read-hl))
(logf "read ~a hubs" (length hublist))
(set! hublist (read-hl))
(logf "read ~a hubs" (length hublist))
- (dc-c&l #t dc-server #t)
- (dc-ecmd-assert 200 "notify" "fn:act" "on")
- (dc-handle-fn)
+ (dc-c&l (not (option-ref opts 'quiet #f)) (option-ref opts 'server #f) #t)
+ (dc-ecmd-assert 200 "notify" "fn:act" "on" "msg" "on")
+ (dc-ecmd-assert 200 "register" "hubmgr")
+ (dc-util-handle 'fn 'msg)
(dc-fnproc-reg 'state (lambda (fn)
(if (and (eq? (cdr (assq 'state fn)) 'dead)
(assq (cdr (assq 'id fn)) (map (lambda (o) (cons (cdr o) (car o))) connlist)))
(dc-fnproc-reg 'state (lambda (fn)
(if (and (eq? (cdr (assq 'state fn)) 'dead)
(assq (cdr (assq 'id fn)) (map (lambda (o) (cons (cdr o) (car o))) connlist)))
@@
-110,10
+116,30
@@
(set! connlist (delq (assq hlf connlist) connlist))
(set! statelist (cons (list hlf (current-time) 10) statelist)))))
(cklist)))
(set! connlist (delq (assq hlf connlist) connlist))
(set! statelist (cons (list hlf (current-time) 10) statelist)))))
(cklist)))
+ (dc-msgproc-reg (lambda (sender msg)
+ (if (equal? (car msg) "exit")
+ (throw 'quit 0))))
(dc-loop-reg ".periodic" #f cklist)
(dc-loop-reg ".periodic" #f cklist)
+ (if (not (option-ref opts 'nodaemon #f))
+ (begin (logf "daemonizing...")
+ (if (= (primitive-fork) 0)
+ (set! logdest #f)
+ (primitive-exit 0))))
+
+ (for-each (lambda (sig) (sigaction sig (lambda (sig) (throw 'quit 0)))) (list SIGINT SIGTERM SIGHUP))
(cklist)
(cklist)
- (dc-loop)))
+ (catch 'quit dc-loop
+ (lambda (sig ret)
+ (catch 'quit
+ (lambda ()
+ (for-each (lambda (o)
+ (if (not (eq? (cdr o) 'pend))
+ (dc-ecmd "dcnct" (cdr o))))
+ connlist)
+ )
+ (lambda (sig ret) ret))
+ ret))))
(setlocale LC_ALL "")
(hubmgr-main (command-line))
(setlocale LC_ALL "")
(hubmgr-main (command-line))