From 03704697c613b03a0f4e88603542196ca92e2de5 Mon Sep 17 00:00:00 2001 From: jtmoon79 <815261+jtmoon79@users.noreply.github.com> Date: Sat, 13 May 2023 15:48:47 -0700 Subject: [PATCH] update compare-current-and-expected --- ...mpare-current-and-expected_expected.stderr | 34 +++++++++---------- ...mpare-current-and-expected_expected.stdout | 32 ++++++++--------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/tools/compare-current-and-expected_expected.stderr b/tools/compare-current-and-expected_expected.stderr index 4721f3b2..fd4aa907 100644 --- a/tools/compare-current-and-expected_expected.stderr +++ b/tools/compare-current-and-expected_expected.stderr @@ -6779,13 +6779,13 @@ File: ./logs/synology-DS6/downloadstation.log logmessagetype : syslog lines MIME guess : MimeGuess(["text/plain"]) Printed: - bytes : 4295 + bytes : 4296 lines : 19 syslines : 19 Processed: - file size : 2186 (0x88A) (bytes) - bytes : 2186 (0x88A) - bytes total : 2186 (0x88A) + file size : 2187 (0x88B) (bytes) + bytes : 2187 (0x88B) + bytes total : 2187 (0x88B) block size : 65535 (0xFFFF) blocks : 1 blocks total : 1 @@ -7148,13 +7148,13 @@ File: ./logs/synology-DS6/opentftp.log logmessagetype : syslog lines MIME guess : MimeGuess(["text/plain"]) Printed: - bytes : 3504 + bytes : 3505 lines : 21 syslines : 21 Processed: - file size : 1173 (0x495) (bytes) - bytes : 1173 (0x495) - bytes total : 1173 (0x495) + file size : 1174 (0x496) (bytes) + bytes : 1174 (0x496) + bytes total : 1174 (0x496) block size : 65535 (0xFFFF) blocks : 1 blocks total : 1 @@ -8215,13 +8215,13 @@ File: ./logs/synology-DS6/surveillance/ssnotification.log logmessagetype : syslog lines MIME guess : MimeGuess(["text/plain"]) Printed: - bytes : 4240 + bytes : 4204 lines : 19 syslines : 19 Processed: - file size : 2131 (0x853) (bytes) - bytes : 2131 (0x853) - bytes total : 2131 (0x853) + file size : 2095 (0x82F) (bytes) + bytes : 2095 (0x82F) + bytes total : 2095 (0x82F) block size : 65535 (0xFFFF) blocks : 1 blocks total : 1 @@ -10185,13 +10185,13 @@ File: ./logs/synology-DS6/upstart/mkcert.log logmessagetype : syslog lines MIME guess : MimeGuess(["text/plain"]) Printed: - bytes : 3507 + bytes : 3521 lines : 19 syslines : 15 Processed: - file size : 1398 (0x576) (bytes) - bytes : 1398 (0x576) - bytes total : 1398 (0x576) + file size : 1412 (0x584) (bytes) + bytes : 1412 (0x584) + bytes total : 1412 (0x584) block size : 65535 (0xFFFF) blocks : 1 blocks total : 1 @@ -17714,7 +17714,7 @@ Paths considered : 434 Paths not processed : 0 Files processed : 434 Files printed : 402 -Printed bytes : 11978657 +Printed bytes : 11978637 Printed lines : 14580 Printed syslines : 12133 Printed utmpx : 7 diff --git a/tools/compare-current-and-expected_expected.stdout b/tools/compare-current-and-expected_expected.stdout index ffc3da91..644897a4 100644 --- a/tools/compare-current-and-expected_expected.stdout +++ b/tools/compare-current-and-expected_expected.stdout @@ -6260,7 +6260,7 @@ ⇳ ./logs/synology-DS6/upstart/mkcert.log ┋20161206T043116.000000000┋2016-12-05T20:31:16-0800 ...............+++ ⇳ -./logs/synology-DS6/upstart/mkcert.log ┋20161206T043116.000000000┋2016-12-05T20:31:16-0800 writing new private key to '/usr/syno/etc/certificate/_archive/cI1OYy/syno-ca-privkey.pem' +./logs/synology-DS6/upstart/mkcert.log ┋20161206T043116.000000000┋2016-12-05T20:31:16-0800 writing new private key to '/usr/local/syno/etc/certificate/_archive/cI21OYy/syno-ca-privkey.pem' ⇳ ./logs/synology-DS6/upstart/mkcert.log ┋20161206T043116.000000000┋2016-12-05T20:31:16-0800 ----- ⇳ @@ -6270,7 +6270,7 @@ ⇳ ./logs/synology-DS6/upstart/mkcert.log ┋20161206T043117.000000000┋2016-12-05T20:31:17-0800 ..................................................................+++ ⇳ -./logs/synology-DS6/upstart/mkcert.log ┋20161206T043119.000000000┋2016-12-05T20:31:19-0800 writing new private key to '/usr/syno/etc/certificate/_archive/cI1OYy/privkey.pem' +./logs/synology-DS6/upstart/mkcert.log ┋20161206T043119.000000000┋2016-12-05T20:31:19-0800 writing new private key to '/usr/local/syno/etc/certificate/_archive/cI21OYy/privkey.pem' ⇳ ./logs/synology-DS6/upstart/mkcert.log ┋20161206T043119.000000000┋2016-12-05T20:31:19-0800 ----- ⇳ @@ -7632,9 +7632,9 @@ ./logs/synology-DS6/upstart/sshd.log ┋20161209T025410.000000000┋|... . o. = | ./logs/synology-DS6/upstart/sshd.log ┋20161209T025410.000000000┋|o * . .... . | ./logs/synology-DS6/upstart/sshd.log ┋20161209T025410.000000000┋| .. +. o.oo . | -./logs/synology-DS6/upstart/sshd.log ┋20161209T025410.000000000┋| =... . . | -./logs/synology-DS6/upstart/sshd.log ┋20161209T025410.000000000┋| . . ... | -./logs/synology-DS6/upstart/sshd.log ┋20161209T025410.000000000┋| ... . . | +./logs/synology-DS6/upstart/sshd.log ┋20161209T025410.000000000┋| =...o . . | +./logs/synology-DS6/upstart/sshd.log ┋20161209T025410.000000000┋| . .. ... | +./logs/synology-DS6/upstart/sshd.log ┋20161209T025410.000000000┋| ... .. . | ./logs/synology-DS6/upstart/sshd.log ┋20161209T025410.000000000┋+----[SHA256]-----+ ⇳ ./logs/synology-DS6/upstart/rsyncd-adapter.log ┋20161209T025418.000000000┋2016-12-08T18:54:18-0800 start: Job is already running: sshd @@ -8589,7 +8589,7 @@ ⇳ ./logs/synology-DS6/opentftp.log ┋20170222T132420.000000000┋[22-Feb-17 21:24:20] Section [ALLOWED-CLIENTS] Invalid entry 192.168.0.0-192.168.0.255 in ini file, ignored ⇳ -./logs/synology-DS6/opentftp.log ┋20170222T132420.000000000┋[22-Feb-17 21:24:20] username: root +./logs/synology-DS6/opentftp.log ┋20170222T132420.000000000┋[22-Feb-17 21:24:20] username: user2 ⇳ ./logs/synology-DS6/opentftp.log ┋20170222T132420.000000000┋[22-Feb-17 21:24:20] alias / is mapped to /path3/ ⇳ @@ -13553,7 +13553,7 @@ ⇳ ./logs/synology-DS6/downloadstation.log ┋20190831T215947.000000000┋2019-08-31T14:59:47-07:00 dsnet synorsstool: RssFeedHandler.cpp:190 Failed to update RSS feed, id[1], code[526] ⇳ -./logs/synology-DS6/downloadstation.log ┋20190831T215948.000000000┋2019-08-31T14:59:48-07:00 dsnet synorsstool: RssFeedHandler.cpp:306 Failed to download rss feed , url[https://anchor.fm/s/25460/podcast/rss] +./logs/synology-DS6/downloadstation.log ┋20190831T215948.000000000┋2019-08-31T14:59:48-07:00 dsnet synorsstool: RssFeedHandler.cpp:306 Failed to download rss feed , url[https://anchor.fm/s/125460/podcast/rss] ⇳ ./logs/synology-DS6/downloadstation.log ┋20190831T215948.000000000┋2019-08-31T14:59:48-07:00 dsnet synorsstool: RssFeedHandler.cpp:190 Failed to update RSS feed, id[10], code[2404] ⇳ @@ -26621,39 +26621,39 @@ ./logs/other/tests/dtf9d-24-12x2-leapday.log ┋20221212T210000.000000000┋Dec 12 12:00:00 HDT 23 ./logs/other/tests/dtf9d-24-12x2-leapday.log ┋20221212T210000.000000000┋ ⇳ -./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133029.000000000┋Dec 15 21:30:29 [9992][9992] ssnotify.cpp:487:Send(): Send notification by push serv: EvtType[5] SenderType[0] SenderName[camlilhiknet] +./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133029.000000000┋Dec 15 21:30:29 [9992][9992] ssnotify.cpp:487:Send(): Send notification by push serv: EvtType[5] SenderType[0] SenderName[camhost1] ⇳ ./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133102.000000000┋Dec 15 21:31:02 [9992][9992] ssmail.cpp:395:MailSendEvent(): Send email via SDK ⇳ ./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133103.000000000┋Dec 15 21:31:03 [9992][9992] ssmail.cpp:397:MailSendEvent(): Send email via SDK done ⇳ -./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133103.000000000┋Dec 15 21:31:03 [9992][9992] ssnotify.cpp:467:Send(): Send notification by mail: EvtType[5] SenderType[0] SenderName[camlilhiknet] +./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133103.000000000┋Dec 15 21:31:03 [9992][9992] ssnotify.cpp:467:Send(): Send notification by mail: EvtType[5] SenderType[0] SenderName[camhost1] ⇳ -./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133103.000000000┋Dec 15 21:31:03 [9992][9992] ssnotify.cpp:487:Send(): Send notification by push serv: EvtType[5] SenderType[0] SenderName[camlilhiknet] +./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133103.000000000┋Dec 15 21:31:03 [9992][9992] ssnotify.cpp:487:Send(): Send notification by push serv: EvtType[5] SenderType[0] SenderName[camhost1] ⇳ ./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133125.000000000┋Dec 15 21:31:25 [9992][9992] ssnotify.cpp:487:Send(): Send notification by push serv: EvtType[5] SenderType[0] SenderName[hiknet] ⇳ ./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133129.000000000┋Dec 15 21:31:29 [9992][9992] ssnotify.cpp:487:Send(): Send notification by push serv: EvtType[5] SenderType[0] SenderName[device55] ⇳ -./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133145.000000000┋Dec 15 21:31:45 [9992][9992] ssnotify.cpp:487:Send(): Send notification by push serv: EvtType[5] SenderType[0] SenderName[camlilhiknet] +./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133145.000000000┋Dec 15 21:31:45 [9992][9992] ssnotify.cpp:487:Send(): Send notification by push serv: EvtType[5] SenderType[0] SenderName[camhost1] ⇳ ./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133205.000000000┋Dec 15 21:32:05 [9992][9992] ssmail.cpp:395:MailSendEvent(): Send email via SDK ⇳ ./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133206.000000000┋Dec 15 21:32:06 [9992][9992] ssmail.cpp:397:MailSendEvent(): Send email via SDK done ⇳ -./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133206.000000000┋Dec 15 21:32:06 [9992][9992] ssnotify.cpp:467:Send(): Send notification by mail: EvtType[5] SenderType[0] SenderName[camlilhiknet] +./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133206.000000000┋Dec 15 21:32:06 [9992][9992] ssnotify.cpp:467:Send(): Send notification by mail: EvtType[5] SenderType[0] SenderName[camhost1] ⇳ -./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133206.000000000┋Dec 15 21:32:06 [9992][9992] ssnotify.cpp:487:Send(): Send notification by push serv: EvtType[5] SenderType[0] SenderName[camlilhiknet] +./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133206.000000000┋Dec 15 21:32:06 [9992][9992] ssnotify.cpp:487:Send(): Send notification by push serv: EvtType[5] SenderType[0] SenderName[camhost1] ⇳ -./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133252.000000000┋Dec 15 21:32:52 [9992][9992] ssnotify.cpp:487:Send(): Send notification by push serv: EvtType[5] SenderType[0] SenderName[camlilhiknet] +./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133252.000000000┋Dec 15 21:32:52 [9992][9992] ssnotify.cpp:487:Send(): Send notification by push serv: EvtType[5] SenderType[0] SenderName[camhost1] ⇳ ./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133309.000000000┋Dec 15 21:33:09 [9992][9992] ssmail.cpp:395:MailSendEvent(): Send email via SDK ⇳ ./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133310.000000000┋Dec 15 21:33:10 [9992][9992] ssmail.cpp:397:MailSendEvent(): Send email via SDK done ⇳ -./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133310.000000000┋Dec 15 21:33:10 [9992][9992] ssnotify.cpp:467:Send(): Send notification by mail: EvtType[5] SenderType[0] SenderName[camlilhiknet] +./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133310.000000000┋Dec 15 21:33:10 [9992][9992] ssnotify.cpp:467:Send(): Send notification by mail: EvtType[5] SenderType[0] SenderName[camhost1] ⇳ -./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133310.000000000┋Dec 15 21:33:10 [9992][9992] ssnotify.cpp:487:Send(): Send notification by push serv: EvtType[5] SenderType[0] SenderName[camlilhiknet] +./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133310.000000000┋Dec 15 21:33:10 [9992][9992] ssnotify.cpp:487:Send(): Send notification by push serv: EvtType[5] SenderType[0] SenderName[camhost1] ⇳ ./logs/synology-DS6/surveillance/ssnotification.log ┋20221215T133411.000000000┋Dec 15 21:34:11 [9992][9992] ssmail.cpp:395:MailSendEvent(): Send email via SDK ⇳