Overview
| Comment: | Fixed mysterious crashing on SLES11 bug, just a typo |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.60 |
| Files: | files | file ages | folders |
| SHA1: |
8b114d33a761c1efdad6f441c8ac5282 |
| User & Date: | mrwellan on 2014-08-28 12:27:29 |
| Other Links: | branch diff | manifest | tags |
Context
|
2014-08-28
| ||
| 20:29 | Partial implimentation of dot locking on run-id db creation. check-in: c64332761d user: mrwellan tags: v1.60 | |
| 12:27 | Fixed mysterious crashing on SLES11 bug, just a typo check-in: 8b114d33a7 user: mrwellan tags: v1.60 | |
| 00:47 | Fixed broken query check-in: a09b4531f6 user: matt tags: v1.60 | |
Changes
Modified http-transport.scm from [036c00eb08] to [a9f6d77e91].
| ︙ | ︙ | |||
66 67 68 69 70 71 72 | (let* ((db #f) ;; (open-db)) ;; we don't want the server to be opening and closing the db unnecesarily (hostname (get-host-name)) (ipaddrstr (let ((ipstr (if (string=? "-" hostn) ;; (string-intersperse (map number->string (u8vector->list (hostname->ip hostname))) ".") (server:get-best-guess-address hostname) #f))) (if ipstr ipstr hostn))) ;; hostname))) | | < | 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 |
(let* ((db #f) ;; (open-db)) ;; we don't want the server to be opening and closing the db unnecesarily
(hostname (get-host-name))
(ipaddrstr (let ((ipstr (if (string=? "-" hostn)
;; (string-intersperse (map number->string (u8vector->list (hostname->ip hostname))) ".")
(server:get-best-guess-address hostname)
#f)))
(if ipstr ipstr hostn))) ;; hostname)))
(start-port (portlogger:open-run-close portlogger:find-port))
(link-tree-path (configf:lookup *configdat* "setup" "linktree")))
;; (set! db *inmemdb*)
(root-path (if link-tree-path
link-tree-path
(current-directory))) ;; WARNING: SECURITY HOLE. FIX ASAP!
(handle-directory spiffy-directory-listing)
;; http-transport:handle-directory) ;; simple-directory-handler)
|
| ︙ | ︙ | |||
136 137 138 139 140 141 142 |
;; This is recursively run by http-transport:run until sucessful
;;
(define (http-transport:try-start-server run-id ipaddrstr portnum server-id)
(handle-exceptions
exn
(begin
(print-error-message exn)
| | < | > > > < < | | | | | | | | | | | | | < < < | 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 |
;; This is recursively run by http-transport:run until sucessful
;;
(define (http-transport:try-start-server run-id ipaddrstr portnum server-id)
(handle-exceptions
exn
(begin
(print-error-message exn)
(if (< portnum 61000)
(begin
(portlogger:open-run-close portlogger:set-failed portnum)
(debug:print 0 "WARNING: failed to start on portnum: " portnum ", trying next port")
(thread-sleep! 0.1)
;; get_next_port goes here
(http-transport:try-start-server run-id
ipaddrstr
(portlogger:open-run-close portlogger:find-port)
server-id))
(begin
(open-run-close tasks:server-force-clean-run-record tasks:open-db run-id ipaddrstr portnum " http-transport:try-start-server")
(print "ERROR: Tried and tried but could not start the server"))))
;; any error in following steps will result in a retry
(set! *server-info* (list ipaddrstr portnum))
(open-run-close tasks:server-set-interface-port
tasks:open-db
server-id
ipaddrstr portnum)
(debug:print 1 "INFO: Trying to start server on " ipaddrstr ":" portnum)
;; This starts the spiffy server
;; NEED WAY TO SET IP TO #f TO BIND ALL
;; (start-server bind-address: ipaddrstr port: portnum)
(start-server port: portnum)
;; (portlogger:open-run-close portlogger:set-port portnum "released")
(open-run-close tasks:server-force-clean-run-record tasks:open-db run-id ipaddrstr portnum " http-transport:try-start-server")
(debug:print 1 "INFO: server has been stopped")))
;;======================================================================
;; S E R V E R U T I L I T I E S
;;======================================================================
;;======================================================================
;; C L I E N T S
|
| ︙ | ︙ |
Modified portlogger.scm from [7db2815ac3] to [5bba6c3236].
| ︙ | ︙ | |||
34 35 36 37 38 39 40 |
fail_count INTEGER DEFAULT 0,
update_time TIMESTAMP DEFAULT (strftime('%s','now')) );"))
db))
(define (portlogger:open-run-close proc . params)
(handle-exceptions
exn
| > | > > > | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 |
fail_count INTEGER DEFAULT 0,
update_time TIMESTAMP DEFAULT (strftime('%s','now')) );"))
db))
(define (portlogger:open-run-close proc . params)
(handle-exceptions
exn
(begin
(debug:print 0 "ERROR: portlogger:open-run-close failed. " proc " " params)
(debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
(debug:print 0 "exn=" (condition->list exn))
(print-call-chain))
(let* ((db (portlogger:open-db (conc "/tmp/." (current-user-name) "-portlogger.db")))
(res (apply proc db params)))
(sqlite3:finalize! db)
res)))
;; (fold-row PROC INIT DATABASE SQL . PARAMETERS)
(define (portlogger:take-port db portnum)
|
| ︙ | ︙ | |||
78 79 80 81 82 83 84 85 86 87 88 89 90 91 |
(define (portlogger:get-prev-used-port db)
(sqlite3:fold-row
(lambda (var curr)
(or curr var curr))
#f
db
"SELECT (port) FROM ports WHERE state='released' LIMIT 1;"))
;; set port to "released", "failed" etc.
;;
(define (portlogger:set-port db portnum value)
(sqlite3:execute db "UPDATE ports SET state=?,update_time=strftime('%s','now') WHERE port=?;" value portnum))
;; set port to failed (attempted to take but got error)
| > > > > > > > | 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 |
(define (portlogger:get-prev-used-port db)
(sqlite3:fold-row
(lambda (var curr)
(or curr var curr))
#f
db
"SELECT (port) FROM ports WHERE state='released' LIMIT 1;"))
(define (portlogger:find-port db)
(let ((portnum (or (portlogger:get-prev-used-port db)
(+ 50000 ;; top of registered ports
(random (- 60000 50000))))))
(portlogger:take-port db portnum)
portnum))
;; set port to "released", "failed" etc.
;;
(define (portlogger:set-port db portnum value)
(sqlite3:execute db "UPDATE ports SET state=?,update_time=strftime('%s','now') WHERE port=?;" value portnum))
;; set port to failed (attempted to take but got error)
|
| ︙ | ︙ |