commit f0eb44fa695d05338bf6dc6b5b1a82a81c55b726
parent c032cde8bcb6918c5436c8d5cc3b91225185ad6c
Author: kyle <kyle@getaddrinfo.net>
Date: Mon, 23 Nov 2015 20:36:01 -0700
sl: only show pid on new connection line
- pid isn't critical enough information to have on every line
- so remove it from the header, and print it only once
Diffstat:
15 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/sl b/sl
@@ -157,8 +157,8 @@ while (my ($new_sock, $bin_addr) = $sock->accept()) {
# NI_NUMERIC* mean don't try and resolve ip address or port
my ($err, $addr, $port) = getnameinfo($bin_addr, NI_NUMERICHOST | NI_NUMERICSERV);
print "warn: getnameinfo() failed: $err\n" if ($err);
- $addr = sprintf "%s [%5s] %15s/%5i", strftime("%F %T", localtime), $$, $addr, $port;
- print "$addr: new connection\n";
+ $addr = sprintf "%s %-15s %-5s", strftime("%F %T", localtime), $addr, $port;
+ print "$addr: new connection (pid = '$$')\n";
# read will be 0 when there's nothing else to read
while (my $bread = read $new_sock, my $metadata, 4) {
diff --git a/tests/add_friend/server.log.good b/tests/add_friend/server.log.good
@@ -1,4 +1,4 @@
-new connection
-added new device <phone_num> <base64>
-<base64> adding <phone_num>
+new connection (pid = <digits>)
+added new device <digits> <base64>
+<base64> adding <digits>
disconnected!
diff --git a/tests/bad_deviceid/server.log.good b/tests/bad_deviceid/server.log.good
@@ -1,4 +1,4 @@
-new connection
+new connection (pid = <digits>)
unknown device <base64>
unknown device <base64>
unknown device <base64>
diff --git a/tests/bad_msg/server.log.good b/tests/bad_msg/server.log.good
@@ -1,3 +1,3 @@
-new connection
+new connection (pid = <digits>)
unknown message type 0xbadd
disconnected!
diff --git a/tests/double_register/server.log.good b/tests/double_register/server.log.good
@@ -1,4 +1,4 @@
-new connection
-added new device <phone_num> <base64>
+new connection (pid = <digits>)
+added new device <digits> <base64>
phone number 4038675309 already exists
disconnected!
diff --git a/tests/leave_list_self/server.log.good b/tests/leave_list_self/server.log.good
@@ -1,5 +1,5 @@
-new connection
-added new device <phone_num> <base64>
+new connection (pid = <digits>)
+added new device <digits> <base64>
<string>
adding first list member devid = <base64>
list fingerprint = <base64>
diff --git a/tests/list_request_basic/server.log.good b/tests/list_request_basic/server.log.good
@@ -1,5 +1,5 @@
-new connection
-added new device <phone_num> <base64>
+new connection (pid = <digits>)
+added new device <digits> <base64>
<string>
adding first list member devid = <base64>
list fingerprint = <base64>
diff --git a/tests/new_device/server.log.good b/tests/new_device/server.log.good
@@ -1,3 +1,3 @@
-new connection
-added new device <phone_num> <base64>
+new connection (pid = <digits>)
+added new device <digits> <base64>
disconnected!
diff --git a/tests/new_device_bad_phnum/server.log.good b/tests/new_device_bad_phnum/server.log.good
@@ -1,3 +1,3 @@
-new connection
+new connection (pid = <digits>)
device phone number 403867530& invalid
disconnected!
diff --git a/tests/new_list/server.log.good b/tests/new_list/server.log.good
@@ -1,5 +1,5 @@
-new connection
-added new device <phone_num> <base64>
+new connection (pid = <digits>)
+added new device <digits> <base64>
<string>
adding first list member devid = <base64>
list fingerprint = <base64>
diff --git a/tests/new_list_missing_name/server.log.good b/tests/new_list_missing_name/server.log.good
@@ -1,4 +1,4 @@
-new connection
-added new device <phone_num> <base64>
+new connection (pid = <digits>)
+added new device <digits> <base64>
list name missing
disconnected!
diff --git a/tests/payload_size_zero/server.log.good b/tests/payload_size_zero/server.log.good
@@ -1,3 +1,3 @@
-new connection
+new connection (pid = <digits>)
message size not 0 < 0 <= 1024
disconnected!
diff --git a/tests/payload_too_large/server.log.good b/tests/payload_too_large/server.log.good
@@ -1,3 +1,3 @@
-new connection
+new connection (pid = <digits>)
message size not 0 < 4000 <= 1024
disconnected!
diff --git a/tests/test.mk b/tests/test.mk
@@ -4,7 +4,7 @@ test:
diff:
# remove header, phone numbers, base64 and strings from server.log
sed -i -e "s/.*: //" \
- -e "s/'[0-9]*'/<phone_num>/g" \
+ -e "s/'[0-9]*'/<digits>/g" \
-e "s/'[a-zA-Z0-9/+]*'/<base64>/g" \
-e "s/'[a-zA-Z0-9 ]*'/<string>/g" server.log
diff -u server.log.good server.log
diff --git a/tests/two_lists_same_name/server.log.good b/tests/two_lists_same_name/server.log.good
@@ -1,5 +1,5 @@
-new connection
-added new device <phone_num> <base64>
+new connection (pid = <digits>)
+added new device <digits> <base64>
<string>
adding first list member devid = <base64>
list fingerprint = <base64>
