Overview
| Comment: | Added write + have server case, moved reset connection case earlier |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.62-no-rpc |
| Files: | files | file ages | folders |
| SHA1: |
a0464da9bba49d14f900bdae02c03e20 |
| User & Date: | matt on 2016-12-03 04:34:26 |
| Other Links: | branch diff | manifest | tags |
Context
|
2016-12-03
| ||
| 06:35 | Fixed server bug. check-in: 646544b9fc user: matt tags: v1.62-no-rpc | |
| 04:34 | Added write + have server case, moved reset connection case earlier check-in: a0464da9bb user: matt tags: v1.62-no-rpc | |
|
2016-12-02
| ||
| 18:59 | snapshot check-in: 14585fcb8a user: mrwellan tags: v1.62-no-rpc | |
Changes
Modified rmt.scm from [03be87eda9] to [1c8fab3d5f].
| ︙ | ︙ | |||
89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 |
(rmt:open-qry-close-locally cmd 0 params))
;; on homehost and this is a write, we already have a server
((and (cdr (remote-hh-dat *runremote*)) ;; on homehost
(not (member cmd api:read-only-queries)) ;; this is a write
(remote-server-url *runremote*)) ;; have a server
(mutex-unlock! *rmt-mutex*)
(print "case 4")
(rmt:open-qry-close-locally cmd 0 params))
;; no server contact made and this is a write, passively start a server
((and (not (remote-server-url *runremote*))
(not (member cmd api:read-only-queries)))
(print "case 5")
(let ((serverconn (server:check-if-running *toppath*)))
(if serverconn
(remote-server-url-set! *runremote* serverconn) ;; the string can be consumed by the client setup if needed
(if (not (server:start-attempted? *toppath*))
(server:kind-run *toppath*))))
(if (cdr (remote-hh-dat *runremote*)) ;; we are on the homehost, just do the call
(begin
(mutex-unlock! *rmt-mutex*)
(print "case 5.1")
(rmt:open-qry-close-locally cmd 0 params))
(begin
(mutex-unlock! *rmt-mutex*)
(print "case 5.2")
(tasks:start-and-wait-for-server (tasks:open-db) 0 15)
(rmt:send-receive cmd rid params attemptnum: attemptnum))))
;; if not on homehost ensure we have a connection to a live server
;; NOTE: we *have* a homehost record by now
((and (not (cdr (remote-hh-dat *runremote*))) ;; are we on a homehost?
(not (remote-conndat *runremote*))) ;; and no connection
(print "case 6 hh-dat: " (remote-hh-dat *runremote*) " conndat: " (remote-conndat *runremote*))
(mutex-unlock! *rmt-mutex*)
(tasks:start-and-wait-for-server (tasks:open-db) 0 15)
| > > > > > > > > > > > > > | < < < < < < | 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 |
(rmt:open-qry-close-locally cmd 0 params))
;; on homehost and this is a write, we already have a server
((and (cdr (remote-hh-dat *runremote*)) ;; on homehost
(not (member cmd api:read-only-queries)) ;; this is a write
(remote-server-url *runremote*)) ;; have a server
(mutex-unlock! *rmt-mutex*)
(print "case 4")
(rmt:open-qry-close-locally cmd 0 params))
;; on homehost and this is a write, we have a server (we know because case 4 checked)
((and (cdr (remote-hh-dat *runremote*)) ;; on homehost
(not (member cmd api:read-only-queries)))
(mutex-unlock! *rmt-mutex*)
(print "case 4.1")
(rmt:open-qry-close-locally cmd 0 params))
;; no server contact made and this is a write, passively start a server
((and (not (remote-server-url *runremote*))
(not (member cmd api:read-only-queries)))
(print "case 5")
(let ((serverconn (server:check-if-running *toppath*)))
(if serverconn
(remote-server-url-set! *runremote* serverconn) ;; the string can be consumed by the client setup if needed
(if (not (server:start-attempted? *toppath*))
(server:kind-run *toppath*))))
(if (cdr (remote-hh-dat *runremote*)) ;; we are on the homehost, just do the call
(begin
(mutex-unlock! *rmt-mutex*)
(print "case 5.1")
(rmt:open-qry-close-locally cmd 0 params))
(begin
(mutex-unlock! *rmt-mutex*)
(print "case 5.2")
(tasks:start-and-wait-for-server (tasks:open-db) 0 15)
(rmt:send-receive cmd rid params attemptnum: attemptnum))))
;; reset the connection if it has been unused too long
((and (remote-conndat *runremote*)
(let ((expire-time (- start-time (remote-server-timeout *runremote*))))
(< (http-transport:server-dat-get-last-access (remote-conndat *runremote*)) expire-time)))
(print "case 8")
(remote-conndat-set! *runremote* #f)
(rmt:send-receive cmd rid params attemptnum: attemptnum))
;; if not on homehost ensure we have a connection to a live server
;; NOTE: we *have* a homehost record by now
((and (not (cdr (remote-hh-dat *runremote*))) ;; are we on a homehost?
(not (remote-conndat *runremote*))) ;; and no connection
(print "case 6 hh-dat: " (remote-hh-dat *runremote*) " conndat: " (remote-conndat *runremote*))
(mutex-unlock! *rmt-mutex*)
(tasks:start-and-wait-for-server (tasks:open-db) 0 15)
(remote-conndat-set! *runremote* (rmt:get-connection-info 0)) ;; calls client:setup which calls client:setup-http
(rmt:send-receive cmd rid params attemptnum: attemptnum))
;; all set up if get this far, dispatch the query
((cdr (remote-hh-dat *runremote*)) ;; we are on homehost
(mutex-unlock! *rmt-mutex*)
(print "case 7")
(rmt:open-qry-close-locally cmd (if rid rid 0) params))
;; not on homehost, do server query
(else
(mutex-unlock! *rmt-mutex*)
(print "case 9")
(let* ((conninfo (remote-conndat *runremote*))
(dat (case (remote-transport *runremote*)
((http) (condition-case ;; handling here has caused a lot of problems. However it is needed to deal with attemtped communication to servers that have gone away
|
| ︙ | ︙ |