diff --git a/core/src/nix/daemon.sld b/core/src/nix/daemon.sld index 89f893c..c41c83d 100644 --- a/core/src/nix/daemon.sld +++ b/core/src/nix/daemon.sld @@ -66,7 +66,7 @@ (cond ((eqv? event 'next) (write-string data)) ((eqv? event 'write) (write-string data)) - ((eqv? event 'error) (error data)) + ((eqv? event 'error) (error "daemon logger received error" data)) ((and (eqv? event 'activity-start) (eq? (nix-activity-type data) 104)) (set! build-activity (nix-activity-id data))) ((and (eqv? event 'activity-start) (eq? (nix-activity-type data) 105)) (printf "[..building ~S]\n" (vector-ref (nix-activity-fields data) 0))) ((and (eqv? event 'activity-result) (eqv? (nix-activity-type data) 101)) (write-string (vector-ref (nix-activity-fields data) 0)) (newline)) @@ -84,7 +84,7 @@ ((#x64617461) (daemon-write-u64 link (daemon-read-u64 link)) (daemon-read-log-events link)) ; STDERR_READ ((#x64617416) ((*logger*) 'write (daemon-read-string link)) (daemon-read-log-events link)) ; STDERR_WRITE ((#x616c7473) ((*logger*) 'last '()) (list)) ; STDERR_LAST - ((#x63787470) ((*logger*) 'error (daemon-read-string link))) ; STDERR_ERROR + ((#x63787470) ((*logger*) 'error (daemon-read-error link))) ; STDERR_ERROR ((#x53545254) ((*logger*) 'activity-start (daemon-read-activity-start link)) (daemon-read-log-events link)) ; STDERR_START_ACTIVITY ((#x53544f50) ((*logger*) 'activity-stop (daemon-read-u64 link)) (daemon-read-log-events link)) ((#x52534c54) ((*logger*) 'activity-result (daemon-read-activity-result link)) (daemon-read-log-events link))