Overview
| Comment: | Put the exception handler back around the eval in configf. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v2.0001 |
| Files: | files | file ages | folders |
| SHA1: |
8d37a1935c4a7d96563776aeda686cfe |
| User & Date: | mrwellan on 2022-01-27 18:04:19 |
| Other Links: | branch diff | manifest | tags |
Context
|
2022-01-27
| ||
| 18:46 | Removed debug message check-in: 5c0b2c5dd4 user: mrwellan tags: v2.0001 | |
| 18:04 | Put the exception handler back around the eval in configf. check-in: 8d37a1935c user: mrwellan tags: v2.0001 | |
| 15:54 | fixed couple issues in reading config files check-in: f82d420370 user: mrwellan tags: v2.0001 | |
Changes
Modified configfmod.scm from [ce971ccabd] to [ae28cc9731].
| ︙ | ︙ | |||
1056 1057 1058 1059 1060 1061 1062 |
(debug:print-error 0 *default-log-port* "#{get ...} used with only one parameter, \"" cmd "\", two needed.")
'(bad-param ,(conc "#{get ...} used with only one parameter, \"" cmd "\", two needed.")))))
((runconfigs-get rget) `(noeval-needed ,(runconfigs-get ht quotedcmd))) ;; (conc "(lambda (ht)(runconfigs-get ht \"" cmd "\"))"))
(else `(#f ,(conc "cmd: " cmd " not recognised")))))))
(match
fullcmd
(('eval-needed newres)
| > > > > > > > | | | | | < | < < < < | | | | | 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 |
(debug:print-error 0 *default-log-port* "#{get ...} used with only one parameter, \"" cmd "\", two needed.")
'(bad-param ,(conc "#{get ...} used with only one parameter, \"" cmd "\", two needed.")))))
((runconfigs-get rget) `(noeval-needed ,(runconfigs-get ht quotedcmd))) ;; (conc "(lambda (ht)(runconfigs-get ht \"" cmd "\"))"))
(else `(#f ,(conc "cmd: " cmd " not recognised")))))))
(match
fullcmd
(('eval-needed newres)
(if (or allow-system
(not (member cmdtype '("system" "shell" "sh"))))
(begin
(debug:print 0 *default-log-port* "eval: "newres)
(with-input-from-string newres
(lambda ()
(set! result
(handle-exceptions
exn
(begin
(debug:print 0 *default-log-port* "WARNING: failed to process config input \"" l "\", eval-needed, newres="newres", exn="(condition->list exn))
(debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
(set! result (conc "#{( " cmdtype ") " cmd "}, full expansion: " newres)))
(if env-to-use
((eval (read) env-to-use) ht)
((eval (read)) ht)
))))))
(set! result (conc "#{(" cmdtype ") " cmd "}")))); )
(('noeval-needed newres)(set! result newres))
(else ;; (#f errres)
(debug:print 0 *default-log-port* "WARNING: failed to process config input \""l"\", fullcmd="fullcmd".")))
;; we process as a result
(let ((delta (- (current-seconds) start-time)))
(debug:print-info (if (> delta 2) 0 9) *default-log-port* "for line \"" l "\"\n command: " cmd " took " delta " seconds to run with output:\n " result))
|
| ︙ | ︙ |