Overview
| Comment: | Minor improvement to server login messages |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
2b78b4fb4162ff470e0792ec37bd30ba |
| User & Date: | matt on 2012-10-08 23:27:23 |
| Other Links: | manifest | tags |
Context
|
2012-10-08
| ||
| 23:49 | Added kill of dboard to kill target check-in: e1d9cf7044 user: matt tags: trunk, test1-test4-clean-with-rpc-ubuntu, v1.4612 | |
| 23:42 | Cleaned up some calls to rpc procedures. Closed-Leaf check-in: 21a6dc94ac user: matt tags: rpc-db-access | |
| 23:27 | Minor improvement to server login messages check-in: 2b78b4fb41 user: matt tags: trunk | |
| 23:14 | Merged in updates to installall.sh check-in: 535076aae1 user: matt tags: trunk | |
Changes
Modified server.scm from [e3a9a59227] to [5d7f3edf83].
| ︙ | ︙ | |||
147 148 149 150 151 152 153 |
(define (server:keep-running db host:port)
;; if none running or if > 20 seconds since
;; server last used then start shutdown
(let loop ((count 0))
(thread-sleep! 20) ;; no need to do this very often
(let ((numrunning (db:get-count-tests-running db)))
| | | > > > | < | < | 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 |
(define (server:keep-running db host:port)
;; if none running or if > 20 seconds since
;; server last used then start shutdown
(let loop ((count 0))
(thread-sleep! 20) ;; no need to do this very often
(let ((numrunning (db:get-count-tests-running db)))
(if (or (> numrunning 0)
(> (+ *last-db-access* 60)(current-seconds)))
(begin
(debug:print 0 "INFO: Server continuing, tests running: " numrunning ", seconds since last db access: " (- (current-seconds) *last-db-access*))
(loop (+ 1 count)))
(begin
(debug:print 0 "INFO: Starting to shutdown the server side")
;; need to delete only *my* server entry (future use)
(sqlite3:execute db "DELETE FROM metadat WHERE var='SERVER' AND val like ?;" host:port)
(thread-sleep! 10)
(debug:print 0 "INFO: Max cached queries was " *max-cache-size*)
(debug:print 0 "INFO: Server shutdown complete. Exiting")
;; (exit)))
)))))
(define (server:find-free-port-and-open port)
(handle-exceptions
exn
(begin
(print "Failed to bind to port " (rpc:default-server-port) ", trying next port")
(server:find-free-port-and-open (+ port 1)))
|
| ︙ | ︙ | |||
197 198 199 200 201 202 203 | ;; (lambda (db . param) ;; (sqlite3:execute db "DELETE FROM metadat WHERE var='SERVER'")) ;; #f) (set! *runremote* #f)) (if (and (not (args:get-arg "-server")) ;; no point in the server using the server using the server ((rpc:procedure 'server:login host portn) *toppath*)) (begin | | | | 198 199 200 201 202 203 204 205 206 207 208 209 210 211 | ;; (lambda (db . param) ;; (sqlite3:execute db "DELETE FROM metadat WHERE var='SERVER'")) ;; #f) (set! *runremote* #f)) (if (and (not (args:get-arg "-server")) ;; no point in the server using the server using the server ((rpc:procedure 'server:login host portn) *toppath*)) (begin (debug:print 2 "INFO: Logged in and connected to " host ":" port) (set! *runremote* (vector host portn))) (begin (debug:print 2 "INFO: Failed to login or connect to " host ":" port) (set! *runremote* #f))))) (debug:print 2 "INFO: no server available"))))) |
Modified utils/installall.sh from [a7a0bd3c37] to [b8d822887a].
| ︙ | ︙ | |||
88 89 90 91 92 93 94 95 96 97 98 99 100 101 |
cd $BUILDHOME
for a in `ls */*.meta|cut -f1 -d/` ; do
echo $a
(cd $a;chicken-install)
done
export SQLITE3_VERSION=3071401
echo Install sqlite3
if ! [[ -e sqlite-autoconf-$SQLITE3_VERSION.tar.gz ]]; then
wget http://www.sqlite.org/sqlite-autoconf-$SQLITE3_VERSION.tar.gz
fi
| > > | 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 |
cd $BUILDHOME
for a in `ls */*.meta|cut -f1 -d/` ; do
echo $a
(cd $a;chicken-install)
done
export LIBPATH=$PREFIX/lib$ADDITIONAL_LIBPATH
export LD_LIBRARY_PATH=$LIBPATH
export SQLITE3_VERSION=3071401
echo Install sqlite3
if ! [[ -e sqlite-autoconf-$SQLITE3_VERSION.tar.gz ]]; then
wget http://www.sqlite.org/sqlite-autoconf-$SQLITE3_VERSION.tar.gz
fi
|
| ︙ | ︙ |