diff options
| author | Shulhan <ms@kilabit.info> | 2023-11-29 23:26:28 +0700 |
|---|---|---|
| committer | Shulhan <ms@kilabit.info> | 2023-12-01 13:17:30 +0700 |
| commit | fa3683edd2d986a26de85479b8a1c2535d069c15 (patch) | |
| tree | f0ab0ba1e0f31b3a41a537b1def3d003059f6816 | |
| parent | 8ba6d6682e082e3bb0a1f92a33bc4c3b5703535b (diff) | |
| download | awwan-fa3683edd2d986a26de85479b8a1c2535d069c15.tar.xz | |
all: remove script name in the log prefix
Since each execution now logged in the file with ".log" extension,
there is no need to prefix it with script name again, because its
redundant.
| -rw-r--r-- | exec_request.go | 2 | ||||
| -rw-r--r-- | testdata/http_server/execute/local_test.data | 6 | ||||
| -rw-r--r-- | testdata/local/local_encrypted.data | 16 | ||||
| -rw-r--r-- | testdata/local/local_test.data | 10 | ||||
| -rw-r--r-- | testdata/play/awwanssh.test/play_test.data | 12 |
5 files changed, 23 insertions, 23 deletions
diff --git a/exec_request.go b/exec_request.go index fb3b2c1..893d866 100644 --- a/exec_request.go +++ b/exec_request.go @@ -85,7 +85,7 @@ func (req *ExecRequest) init(workDir string) (err error) { namedStderr = mlog.NewNamedWriter(`stderr`, os.Stderr) ) - req.mlog = mlog.NewMultiLogger(defLogTimeFormat, filepath.Base(req.Script), + req.mlog = mlog.NewMultiLogger(defLogTimeFormat, ``, []mlog.NamedWriter{namedStdout}, []mlog.NamedWriter{namedStderr}, ) diff --git a/testdata/http_server/execute/local_test.data b/testdata/http_server/execute/local_test.data index 5cd6f5e..5462667 100644 --- a/testdata/http_server/execute/local_test.data +++ b/testdata/http_server/execute/local_test.data @@ -28,11 +28,11 @@ event: begin data: 2023-11-26T15:21:00Z event: message -data: - local.aww === BEGIN: local /local.aww 1- +data: - === BEGIN: local /local.aww 1- id: 0 event: message -data: - local.aww --> 1: echo "test" +data: - --> 1: echo "test" id: 1 event: message @@ -40,7 +40,7 @@ data: test id: 2 event: message -data: - local.aww === END +data: - === END id: 3 event: end diff --git a/testdata/local/local_encrypted.data b/testdata/local/local_encrypted.data index f08467c..a4f05ad 100644 --- a/testdata/local/local_encrypted.data +++ b/testdata/local/local_encrypted.data @@ -1,23 +1,23 @@ <<< echo_encrypted -- local_encrypted.aww === BEGIN: local testdata/local/local_encrypted.aww 3 -- local_encrypted.aww --> 3: echo this_is_a_secret +- === BEGIN: local testdata/local/local_encrypted.aww 3 +- --> 3: echo this_is_a_secret this_is_a_secret -- local_encrypted.aww === END +- === END <<< echo_encrypted_no_pass Local: NewScript: ParseScript: template: local_encrypted.aww:3:7: executing "local_encrypted.aww" at <.Val>: error calling Val: "secret::pass" is empty <<< echo_encrypted_no_pass:output -- local_encrypted.aww !!! NewScript: ParseScript: template: local_encrypted.aww:3:7: executing "local_encrypted.aww" at <.Val>: error calling Val: "secret::pass" is empty +- !!! NewScript: ParseScript: template: local_encrypted.aww:3:7: executing "local_encrypted.aww" at <.Val>: error calling Val: "secret::pass" is empty <<< echo_encrypted_invalid_pass Local: NewSession: .awwan.env.vault: LoadPrivateKeyInteractive: x509: decryption password incorrect <<< echo_encrypted_invalid_pass:output -- local_encrypted.aww !!! NewSession: .awwan.env.vault: LoadPrivateKeyInteractive: x509: decryption password incorrect +- !!! NewSession: .awwan.env.vault: LoadPrivateKeyInteractive: x509: decryption password incorrect <<< sub_echo_encrypted -- local_encrypted.aww === BEGIN: local testdata/local/sub/local_encrypted.aww 1 -- local_encrypted.aww --> 1: echo this_is_a_secret_in_sub +- === BEGIN: local testdata/local/sub/local_encrypted.aww 1 +- --> 1: echo this_is_a_secret_in_sub this_is_a_secret_in_sub -- local_encrypted.aww === END +- === END diff --git a/testdata/local/local_test.data b/testdata/local/local_test.data index 8459a72..be86cd1 100644 --- a/testdata/local/local_test.data +++ b/testdata/local/local_test.data @@ -1,10 +1,10 @@ Test on "local" command. <<< local:output -- local.aww === BEGIN: local testdata/local/local.aww 1- -- local.aww --> 1: echo "hello" +- === BEGIN: local testdata/local/local.aww 1- +- --> 1: echo "hello" hello -- local.aww --> 4: #local: echo "nothing" -- local.aww --> 6: echo "local" +- --> 4: #local: echo "nothing" +- --> 6: echo "local" local -- local.aww === END +- === END diff --git a/testdata/play/awwanssh.test/play_test.data b/testdata/play/awwanssh.test/play_test.data index e2081fa..862d77a 100644 --- a/testdata/play/awwanssh.test/play_test.data +++ b/testdata/play/awwanssh.test/play_test.data @@ -1,11 +1,11 @@ Test on "play" command. <<< play_with_local:output -- play.aww --- SSH connection: awwanssh@127.0.0.1:10022 -- play.aww --- SSH identity file: [/home/awwan/.ssh/id_ed25519] -- play.aww === BEGIN: play testdata/play/awwanssh.test/play.aww 1- -- play.aww --> 2: pwd +- --- SSH connection: awwanssh@127.0.0.1:10022 +- --- SSH identity file: [/home/awwan/.ssh/id_ed25519] +- === BEGIN: play testdata/play/awwanssh.test/play.aww 1- +- --> 2: pwd /home/awwanssh -- play.aww --> 5: #local: pwd +- --> 5: #local: pwd /home/awwan/src -- play.aww === END +- === END |
