Megatest

Check-in [08364cbabe]
Login
☰Home Timeline Files Branches Tags Tickets Wiki Login
Overview
Comment:Fixed some complile errors
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | v1.65-real-reenable-eval-if
Files: files | file ages | folders
SHA1: 08364cbabe7a9534cbf8db0451f2f5dc26e13543
User & Date: mrwellan on 2021-02-26 16:54:47
Other Links: branch diff | manifest | tags
Context
2021-02-26
16:54
Fixed some complile errors Leaf check-in: 08364cbabe user: mrwellan tags: v1.65-real-reenable-eval-if (unpublished)
2021-02-25
23:25
Merged diet branch

From: 84be6d275afcef4ec123f4afd946b77ff0440ce3 User: matt check-in: 87669bb7f8 user: matt tags: v1.65-real-reenable-eval-if (unpublished)

Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified client.scm from [95a111a332] to [ac1e540dd9].

︙
76
77
78
79
80
81
82
83
84
85
86
87





88
89
90
91
92
93
94
95
96
97
98
99
100
101













102
103
104
105
106
107
108

76
77
78
79
80
81
82





83
84
85
86
87
88













89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108








-
-
-
-
-
+
+
+
+
+

-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+








		  (port  (caddr server-dat))
                  (server-id (caddr (cddr server-dat))))
	      (debug:print-info 4 *default-log-port* "client:setup server-dat=" server-dat ", remaining-tries=" remaining-tries)
	      (if (and (not area-dat)
		       (not *runremote*))
                  (begin       
		    (set! *runremote* (make-remote))
		  (let* ((start-res (http-transport:client-connect host port))
			 (ping-res  (rmt:login-no-auto-client-setup start-res)))
                        (begin
                          (remote-server-url-set! *runremote* (server:record->url server-info))
                          (remote-server-id-set! *runremote* (server:record->id server-info)))))))
		    (let* ((start-res (http-transport:client-connect host port))
			   (ping-res  (rmt:login-no-auto-client-setup start-res)))
                      (begin
                        (remote-server-url-set! *runremote* (server:record->url server-info))
                        (remote-server-id-set! *runremote* (server:record->id server-info))))))
	      (if (and host port server-id)
		    (if (and start-res
			     ping-res)
			(let ((runremote (or area-dat *runremote*))) ;; it might have been generated only a few statements ago
			  (remote-conndat-set! runremote start-res) ;; (hash-table-set! runremote run-id start-res)
			  (debug:print-info 2 *default-log-port* "connected to " (http-transport:server-dat-make-url start-res))
			  start-res)
			(begin    ;; login failed but have a server record, clean out the record and try again
			  (debug:print-info 0 *default-log-port* "client:setup, login unsuccessful, will attempt to start server ... start-res=" start-res ", server-dat=" server-dat) ;; had runid.  Fixes part of Randy;s ticket 1405717332
			  (http-transport:close-connections)
			  (remote-conndat-set! runremote #f)  ;; (hash-table-delete! runremote run-id)
			  (thread-sleep! 1)
			  (client:setup-http areapath remaining-tries: (- remaining-tries 1))
			  )))
		  (if (and start-res
			   ping-res)
		      (let ((runremote (or area-dat *runremote*))) ;; it might have been generated only a few statements ago
			(remote-conndat-set! runremote start-res) ;; (hash-table-set! runremote run-id start-res)
			(debug:print-info 2 *default-log-port* "connected to " (http-transport:server-dat-make-url start-res))
			start-res)
		      (begin    ;; login failed but have a server record, clean out the record and try again
			(debug:print-info 0 *default-log-port* "client:setup, login unsuccessful, will attempt to start server ... start-res=" start-res ", server-dat=" server-dat) ;; had runid.  Fixes part of Randy;s ticket 1405717332
			(http-transport:close-connections)
			(remote-conndat-set! runremote #f)  ;; (hash-table-delete! runremote run-id)
			(thread-sleep! 1)
			(client:setup-http areapath remaining-tries: (- remaining-tries 1))
			))
		  (begin    ;; no server registered
		    ;; (server:kind-run areapath)
		    (server:start-and-wait areapath)
		    (debug:print-info 0 *default-log-port* "client:setup, no server registered, remaining-tries=" remaining-tries)
		    (thread-sleep! 1) ;; (+ 5 (random (- 20 remaining-tries))))  ;; give server a little time to start up, randomize a little to avoid start storms.
		    (client:setup-http areapath remaining-tries: (- remaining-tries 1)))))))))

Modified configf.scm from [d67198199a] to [9fd0d22b70].

︙
57
58
59
60
61
62
63

64
65
66
67
68
69
70

57
58
59
60
61
62
63
64
65
66
67
68
69
70
71








+








(define (configf:section-var-set! cfgdat section-name var value #!key (metadata #f))
  (hash-table-set! cfgdat section-name
		   (configf:assoc-safe-add
		    (hash-table-ref/default cfgdat section-name '())
		    var value metadata: metadata)))

;; The if was disabled, but why?
(define (config:eval-string-in-environment str)
  (if (or (string-null? str)
  	  (equal? "!" (substring str 0 1))) ;; null string or starts with ! are preserved but NOT set in the environment
      str
      (handle-exceptions
	  exn
	  (begin
	    (debug:print-error 0 *default-log-port* "problem evaluating \"" str "\" in the shell environment, exn=" exn)
︙

This page was generated in about 0.108s by Fossil 2.24 [452f8e1ffc] 2024-03-26 15:36:00