Skip to content

Commit

Permalink
Make sure to touch all #printContentsOn: methods in the ZnLogEvent hi…
Browse files Browse the repository at this point in the history 
…erarchy.

Introducte ZnLogEvent class>>#printAddress:on: helper method that relies on SocketAddress.
  • Loading branch information
@svenvc
svenvc committed Oct 2, 2023
1 parent b8532e0 commit 4e6e0fb
Show file tree
Hide file tree
Showing 28 changed files with 40 additions and 21 deletions.
5 changes: 2 additions & 3 deletions ...sitory/Zinc-HTTP.package/ZnClientConnectionClosedEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
printing
printContentsOn: stream
super printContentsOn: stream.

stream << 'Connection Closed '.
address
ifNil: [ stream print: address ]
ifNotNil: [ address do: [ :each | stream print: each ] separatedBy: [ stream nextPut: $. ] ].
self class printAddress: address on: stream.
stream nextPut: $:; print: port
1 change: 1 addition & 0 deletions ...itory/Zinc-HTTP.package/ZnClientFollowingRedirectEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
printing
printContentsOn: stream
super printContentsOn: stream.

stream << 'Following Redirect '; print: target
1 change: 1 addition & 0 deletions ...ackage/ZnClientIgnoringExceptionOnConnectionReuseEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
printing
printContentsOn: stream
super printContentsOn: stream.

stream << 'Ignoring Exception On Connection Reuse '; print: exception
1 change: 1 addition & 0 deletions repository/Zinc-HTTP.package/ZnClientRetryingEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
printing
printContentsOn: stream
super printContentsOn: stream.

stream << 'Retrying '; print: exception
1 change: 1 addition & 0 deletions repository/Zinc-HTTP.package/ZnClientTransactionEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
printing
printContentsOn: stream
super printContentsOn: stream.

request requestLine printMethodAndUriOn: stream.
stream space; print: response code.
response hasEntity
Expand Down
5 changes: 2 additions & 3 deletions repository/Zinc-HTTP.package/ZnConnectionAcceptedEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
printing
printContentsOn: stream
super printContentsOn: stream.

stream << 'Connection Accepted'.
address ifNotNil: [
stream space.
address do: [ :each | stream print: each ] separatedBy: [ stream nextPut: $. ] ]
self class printAddress: address on: stream
5 changes: 2 additions & 3 deletions repository/Zinc-HTTP.package/ZnConnectionEstablishedEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
printing
printContentsOn: stream
super printContentsOn: stream.

stream << 'Connection Established '; nextPutAll: hostname asString; nextPut: $:; print: port.
proxy ifNotNil: [ stream << ' via proxy '; print: proxy ].
stream space.
address
ifNil: [ stream print: address ]
ifNotNil: [ address do: [ :each | stream print: each ] separatedBy: [ stream nextPut: $. ] ].
self class printAddress: address on: stream.
stream nextPut: $:; print: port.
stream space; print: duration; << 'ms'
5 changes: 2 additions & 3 deletions repository/Zinc-HTTP.package/ZnConnectionRejectedEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
printing
printContentsOn: stream
super printContentsOn: stream.

stream << 'Connection Rejected'.
address ifNotNil: [
stream space.
address do: [ :each | stream print: each ] separatedBy: [ stream nextPut: $. ] ]
self class printAddress: address on: stream
6 changes: 6 additions & 0 deletions repository/Zinc-HTTP.package/ZnLogEvent.class/class/printAddress.on..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
utilities
printAddress: address on: stream
"Try printing address as a IPv4 dotted address to stream.
If that fails, just print address as an object to stream."

[ address asSocketAddress printOn: stream ] on: Error do: [ stream print: address ]
1 change: 1 addition & 0 deletions repository/Zinc-HTTP.package/ZnRequestReadEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
printing
printContentsOn: stream
super printContentsOn: stream.

stream << 'Request Read '; print: request; space; print: duration; << 'ms'
1 change: 1 addition & 0 deletions ...sitory/Zinc-HTTP.package/ZnRequestResponseHandledEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
printing
printContentsOn: stream
super printContentsOn: stream.

stream << 'Request Handled '; print: request; space; print: duration; << 'ms'
1 change: 1 addition & 0 deletions repository/Zinc-HTTP.package/ZnRequestWrittenEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
printing
printContentsOn: stream
super printContentsOn: stream.

stream << 'Request Written '; print: request; space; print: duration; << 'ms'
1 change: 1 addition & 0 deletions repository/Zinc-HTTP.package/ZnResponseReadEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
printing
printContentsOn: stream
super printContentsOn: stream.

stream << 'Response Read '; print: response; space; print: duration; << 'ms'
1 change: 1 addition & 0 deletions repository/Zinc-HTTP.package/ZnResponseWrittenEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
printing
printContentsOn: stream
super printContentsOn: stream.

stream << 'Response Written '; print: response; space; print: duration; << 'ms'
5 changes: 2 additions & 3 deletions ...sitory/Zinc-HTTP.package/ZnServerConnectionClosedEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
printing
printContentsOn: stream
super printContentsOn: stream.

stream << 'Server Connection Closed'.
address ifNotNil: [
stream space.
address do: [ :each | stream print: each ] separatedBy: [ stream nextPut: $. ] ]
self class printAddress: address on: stream
1 change: 1 addition & 0 deletions repository/Zinc-HTTP.package/ZnServerGenericLogEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
printing
printContentsOn: stream
super printContentsOn: stream.

stream nextPutAll: subject asString
1 change: 1 addition & 0 deletions repository/Zinc-HTTP.package/ZnServerHandlerErrorEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
printing
printContentsOn: stream
super printContentsOn: stream.

stream << 'Server Handler Error '; print: exception
1 change: 1 addition & 0 deletions repository/Zinc-HTTP.package/ZnServerReadErrorEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
printing
printContentsOn: stream
super printContentsOn: stream.

stream << 'Server Read Error '; print: exception
5 changes: 2 additions & 3 deletions repository/Zinc-HTTP.package/ZnServerSocketBoundEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
printing
printContentsOn: stream
super printContentsOn: stream.

stream << 'Server Socket Bound '.
address
ifNil: [ stream print: address ]
ifNotNil: [ address do: [ :each | stream print: each ] separatedBy: [ stream nextPut: $. ] ].
self class printAddress: address on: stream.
stream nextPut: $:; print: port
5 changes: 2 additions & 3 deletions repository/Zinc-HTTP.package/ZnServerSocketReleasedEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
printing
printContentsOn: stream
super printContentsOn: stream.

stream << 'Server Socket Released '.
address
ifNil: [ stream print: address ]
ifNotNil: [ address do: [ :each | stream print: each ] separatedBy: [ stream nextPut: $. ] ].
self class printAddress: address on: stream.
stream nextPut: $:; print: port
1 change: 1 addition & 0 deletions repository/Zinc-HTTP.package/ZnServerStartedEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
printing
printContentsOn: stream
super printContentsOn: stream.

description ifNotNil: [ stream << 'Started '; << description ]
1 change: 1 addition & 0 deletions repository/Zinc-HTTP.package/ZnServerStoppedEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
printing
printContentsOn: stream
super printContentsOn: stream.

description ifNotNil: [ stream << 'Stopped '; << description ]
1 change: 1 addition & 0 deletions repository/Zinc-HTTP.package/ZnServerTransactionEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
printing
printContentsOn: stream
super printContentsOn: stream.

request requestLine printMethodAndUriOn: stream.
stream space; print: response code.
response hasEntity
Expand Down
1 change: 1 addition & 0 deletions repository/Zinc-HTTP.package/ZnServerWriteErrorEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
printing
printContentsOn: stream
super printContentsOn: stream.

stream << 'Server Write Error '; print: exception
1 change: 1 addition & 0 deletions ...y/Zinc-HTTP.package/ZnSimplifiedClientTransactionEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
printing
printContentsOn: stream
super printContentsOn: stream.

stream nextPutAll: method; space.
url printPathQueryFragmentOn: stream.
stream space; print: response.
Expand Down
1 change: 1 addition & 0 deletions ...y/Zinc-HTTP.package/ZnSimplifiedServerTransactionEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
printing
printContentsOn: stream
super printContentsOn: stream.

stream nextPutAll: method; space.
url printPathQueryFragmentOn: stream.
stream space; print: response.
Expand Down
1 change: 1 addition & 0 deletions ...ocket-Core.package/ZnWebSocketControlFrameHandledEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
printing
printContentsOn: stream
super printContentsOn: stream.

stream << 'WebSocket Control Frame Handled '; print: type
1 change: 1 addition & 0 deletions ...Zinc-WebSocket-Core.package/ZnWebSocketGenericLogEvent.class/instance/printContentsOn..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
printing
printContentsOn: stream
super printContentsOn: stream.

stream << 'WebSocket Generic Log Event '; print: subject

0 comments on commit 4e6e0fb

Please sign in to comment.