Overview
| Comment: | Added sqlite3:with-transaction around the add-to-queue loop for pkts |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.70 |
| Files: | files | file ages | folders |
| SHA1: |
e6c5cce55fe6779634bc07b9e5e10fcb |
| User & Date: | mmgraham on 2023-05-07 17:23:18 |
| Other Links: | branch diff | manifest | tags |
Context
|
2023-05-07
| ||
| 17:40 | Changed version to 1.7014 check-in: a982e41279 user: mmgraham tags: v1.70 | |
| 17:23 | Added sqlite3:with-transaction around the add-to-queue loop for pkts check-in: e6c5cce55f user: mmgraham tags: v1.70 | |
|
2023-03-20
| ||
| 17:28 | disabled syncing of test_steps and test_data. Eliminated querying of run_stats. check-in: 08f7c60b5e user: mmgraham tags: v1.70, v1.7013 | |
Changes
Modified common.scm from [7a004393e6] to [760479d289].
| ︙ | ︙ | |||
3402 3403 3404 3405 3406 3407 3408 | (debug:print 0 *default-log-port* "ERROR: packets directory " pktsdir " does not exist.")) ((not (directory? pktsdir)) (debug:print 0 *default-log-port* "ERROR: packets directory path " pktsdir " is not a directory.")) ((not (file-read-access? pktsdir)) (debug:print 0 *default-log-port* "ERROR: packets directory path " pktsdir " is not readable.")) (else (debug:print-info 0 *default-log-port* "Loading packets found in " pktsdir) | | > > > > > > | | 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 |
(debug:print 0 *default-log-port* "ERROR: packets directory " pktsdir " does not exist."))
((not (directory? pktsdir))
(debug:print 0 *default-log-port* "ERROR: packets directory path " pktsdir " is not a directory."))
((not (file-read-access? pktsdir))
(debug:print 0 *default-log-port* "ERROR: packets directory path " pktsdir " is not readable."))
(else
(debug:print-info 0 *default-log-port* "Loading packets found in " pktsdir)
(let ((pkts (glob (conc pktsdir "/*.pkt")))
(sqdb (dbi:db-conn pdb))
)
;; Put this in a transaction to avoid issues overloading the db
(sqlite3:with-transaction
sqdb
(lambda ()
(for-each
(lambda (pkt)
(let* ((uuid (cadr (string-match ".*/([0-9a-f]+).pkt" pkt)))
(exists (lookup-by-uuid pdb uuid #f)))
(if (not exists)
(let* ((pktdat (string-intersperse
(with-input-from-file pkt read-lines)
"\n"))
(apkt (pkt->alist pktdat))
(ptype (alist-ref 'T apkt)))
(add-to-queue pdb pktdat uuid (or ptype 'cmd) #f 0)
(debug:print 4 *default-log-port* "Added " uuid " of type " ptype " to queue"))
(debug:print 4 *default-log-port* "pkt: " uuid " exists, skipping...")
)))
pkts)))))))
pktsdirs))
use-lt: use-lt))
(define (common:get-pkt-alists pkts)
(map (lambda (x)
(alist-ref 'apkt x)) ;; 'pkta pulls out the alist from the read pkt
pkts))
|
| ︙ | ︙ |