Merge branch 'master' of github.com:svenvc/zinc into svenvc-master

* 'master' of github.com:svenvc/zinc:
  Add a postLoadDoIt to recompile the ZnLogEvent hierarchy when loading the Zinc-HTTP package. This is a hack that should be removed later on.
  Make sure to touch all #printContentsOn: methods in the ZnLogEvent hierarchy. Introducte ZnLogEvent class>>#printAddress:on: helper method that relies on SocketAddress.
  Add ZnLogEventTest with some sanity elementary unit tests
  Change the order of the instance variables of ZnLogEvent
  Make sure to exercise all logLevels in ZnServerTest>>#testLogging
  Add ZnServerTest>>#testLogging with ZnLogEvent rendering

repository/BaselineOfZincHTTPComponents.package/BaselineOfZincHTTPComponents.class/instance/baseline..st

@@ -11,7 +11,8 @@ baseline: spec
 			package: 'Zinc-Character-Encoding-Tests' with: [ spec requires: 'Zinc-Character-Encoding-Core' ];
 			package: 'Zinc-Resource-Meta-Core' with: [ spec requires: 'Zinc-Character-Encoding-Core' ];
 			package: 'Zinc-Resource-Meta-Tests' with: [ spec requires: 'Zinc-Resource-Meta-Core' ];
-			package: 'Zinc-HTTP' with: [ spec requires: #('Zinc-Character-Encoding-Core' 'Zinc-Resource-Meta-Core') ];
+			package: 'Zinc-HTTP' with: [ 
+				spec postLoadDoIt: #recompileZnLogEventHierarchy; requires: #('Zinc-Character-Encoding-Core' 'Zinc-Resource-Meta-Core') ];
 			package: 'Zinc-HTTP-Examples' with: [ spec requires: #('Zinc-HTTP') ];
 			package: 'Zinc-Tests' with: [ spec requires: 'Zinc-HTTP' ];
 			package: 'Zinc-Zodiac-Core' with: [ spec requires: #('Zinc-HTTP' 'Zodiac-Core') ];

repository/BaselineOfZincHTTPComponents.package/BaselineOfZincHTTPComponents.class/instance/recompileZnLogEventHierarchy.st

@@ -0,0 +1,6 @@
+doits
+recompileZnLogEventHierarchy
+	"This is a hack, but somehow there is something wrong in the instance variables layout, 
+	which can only be fixed by recompiling, which should happen but doesn't, so force it."
+
+	ZnLogEvent withAllSubclassesDo: #recompile

repository/Zinc-HTTP.package/ZnClientConnectionClosedEvent.class/instance/printContentsOn..st

@@ -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

repository/Zinc-HTTP.package/ZnClientFollowingRedirectEvent.class/instance/printContentsOn..st

@@ -1,4 +1,5 @@
 printing
 printContentsOn: stream
 	super printContentsOn: stream.
+
 	stream << 'Following Redirect '; print: target

repository/Zinc-HTTP.package/ZnClientIgnoringExceptionOnConnectionReuseEvent.class/instance/printContentsOn..st

@@ -1,4 +1,5 @@
 printing
 printContentsOn: stream
 	super printContentsOn: stream.
+
 	stream << 'Ignoring Exception On Connection Reuse '; print: exception

repository/Zinc-HTTP.package/ZnClientRetryingEvent.class/instance/printContentsOn..st

@@ -1,4 +1,5 @@
 printing
 printContentsOn: stream
 	super printContentsOn: stream.
+
 	stream << 'Retrying '; print: exception

repository/Zinc-HTTP.package/ZnClientTransactionEvent.class/instance/printContentsOn..st

@@ -1,6 +1,7 @@
 printing
 printContentsOn: stream
 	super printContentsOn: stream.
+
 	request requestLine printMethodAndUriOn: stream.
 	stream space; print: response code.
 	response hasEntity

repository/Zinc-HTTP.package/ZnConnectionAcceptedEvent.class/instance/printContentsOn..st

@@ -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 

repository/Zinc-HTTP.package/ZnConnectionEstablishedEvent.class/instance/printContentsOn..st

@@ -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'

repository/Zinc-HTTP.package/ZnConnectionRejectedEvent.class/instance/printContentsOn..st

@@ -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

repository/Zinc-HTTP.package/ZnLogEvent.class/class/printAddress.on..st

@@ -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 ]

repository/Zinc-HTTP.package/ZnLogEvent.class/properties.json

@@ -9,9 +9,9 @@
 		"LogEventAnnouncer"
 	],
 	"instvars" : [
-		"timestamp",
 		"id",
-		"processId"
+		"processId",
+		"timestamp"
 	],
 	"name" : "ZnLogEvent",
 	"type" : "normal"

repository/Zinc-HTTP.package/ZnRequestReadEvent.class/instance/printContentsOn..st

@@ -1,4 +1,5 @@
 printing
 printContentsOn: stream
 	super printContentsOn: stream.
+
 	stream << 'Request Read '; print: request; space; print: duration; << 'ms'

repository/Zinc-HTTP.package/ZnRequestResponseHandledEvent.class/instance/printContentsOn..st

@@ -1,4 +1,5 @@
 printing
 printContentsOn: stream
 	super printContentsOn: stream.
+
 	stream << 'Request Handled '; print: request; space; print: duration; << 'ms'

repository/Zinc-HTTP.package/ZnRequestWrittenEvent.class/instance/printContentsOn..st

@@ -1,4 +1,5 @@
 printing
 printContentsOn: stream
 	super printContentsOn: stream.
+
 	stream << 'Request Written '; print: request; space; print: duration; << 'ms'

repository/Zinc-HTTP.package/ZnResponseReadEvent.class/instance/printContentsOn..st

@@ -1,4 +1,5 @@
 printing
 printContentsOn: stream
 	super printContentsOn: stream.
+
 	stream << 'Response Read '; print: response; space; print: duration; << 'ms'

repository/Zinc-HTTP.package/ZnResponseWrittenEvent.class/instance/printContentsOn..st

@@ -1,4 +1,5 @@
 printing
 printContentsOn: stream
 	super printContentsOn: stream.
+
 	stream << 'Response Written '; print: response; space; print: duration; << 'ms'

repository/Zinc-HTTP.package/ZnServerConnectionClosedEvent.class/instance/printContentsOn..st

@@ -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 

repository/Zinc-HTTP.package/ZnServerGenericLogEvent.class/instance/printContentsOn..st

@@ -1,4 +1,5 @@
 printing
 printContentsOn: stream
 	super printContentsOn: stream.
+
 	stream nextPutAll: subject asString

repository/Zinc-HTTP.package/ZnServerHandlerErrorEvent.class/instance/printContentsOn..st

@@ -1,4 +1,5 @@
 printing
 printContentsOn: stream
 	super printContentsOn: stream.
+
 	stream << 'Server Handler Error ';  print: exception

repository/Zinc-HTTP.package/ZnServerReadErrorEvent.class/instance/printContentsOn..st

@@ -1,4 +1,5 @@
 printing
 printContentsOn: stream
 	super printContentsOn: stream.
+
 	stream << 'Server Read Error ';  print: exception

repository/Zinc-HTTP.package/ZnServerSocketBoundEvent.class/instance/printContentsOn..st

@@ -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

repository/Zinc-HTTP.package/ZnServerSocketReleasedEvent.class/instance/printContentsOn..st

@@ -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

repository/Zinc-HTTP.package/ZnServerStartedEvent.class/instance/printContentsOn..st

@@ -1,4 +1,5 @@
 printing
 printContentsOn: stream
 	super printContentsOn: stream.
+
 	description ifNotNil: [ stream << 'Started '; << description ]

repository/Zinc-HTTP.package/ZnServerStoppedEvent.class/instance/printContentsOn..st

@@ -1,4 +1,5 @@
 printing
 printContentsOn: stream
 	super printContentsOn: stream.
+
 	description ifNotNil: [ stream << 'Stopped '; << description ]

repository/Zinc-HTTP.package/ZnServerTransactionEvent.class/instance/printContentsOn..st

@@ -1,6 +1,7 @@
 printing
 printContentsOn: stream
 	super printContentsOn: stream.
+
 	request requestLine printMethodAndUriOn: stream.
 	stream space; print: response code.
 	response hasEntity

repository/Zinc-HTTP.package/ZnServerWriteErrorEvent.class/instance/printContentsOn..st

@@ -1,4 +1,5 @@
 printing
 printContentsOn: stream
 	super printContentsOn: stream.
+
 	stream << 'Server Write Error ';  print: exception

repository/Zinc-HTTP.package/ZnSimplifiedClientTransactionEvent.class/instance/printContentsOn..st

@@ -1,6 +1,7 @@
 printing
 printContentsOn: stream
 	super printContentsOn: stream.
+
 	stream nextPutAll: method; space.
 	url printPathQueryFragmentOn: stream.
 	stream space; print: response.

repository/Zinc-HTTP.package/ZnSimplifiedServerTransactionEvent.class/instance/printContentsOn..st

@@ -1,6 +1,7 @@
 printing
 printContentsOn: stream
 	super printContentsOn: stream.
+
 	stream nextPutAll: method; space.
 	url printPathQueryFragmentOn: stream.
 	stream space; print: response.

repository/Zinc-Tests.package/ZnLogEventTest.class/instance/clientId.st

@@ -0,0 +1,3 @@
+accessing
+clientId
+	^ 'client-1'

repository/Zinc-Tests.package/ZnLogEventTest.class/instance/request.st

@@ -0,0 +1,3 @@
+accessing
+request
+	^ ZnRequest get: 'http://foo.com/test'

repository/Zinc-Tests.package/ZnLogEventTest.class/instance/response.st

@@ -0,0 +1,3 @@
+accessing
+response
+	^ ZnResponse ok: (ZnEntity text: 'OK')

repository/Zinc-Tests.package/ZnLogEventTest.class/instance/serverId.st

@@ -0,0 +1,3 @@
+accessing
+serverId
+	^ 'server-1'

repository/Zinc-Tests.package/ZnLogEventTest.class/instance/testClientTransactionEvent.st

@@ -0,0 +1,19 @@
+testing
+testClientTransactionEvent
+	| event |
+	(event := ZnClientTransactionEvent new)
+		clientId: self clientId;
+		request: self request;
+		response: self response;
+		requestDuration: self timing requestDuration;
+		responseDuration: self timing responseDuration.
+	self assert: event id isInteger.
+	self assert: event processId isInteger.
+	self assert: event timestamp <= DateAndTime now.
+	self assert: event clientId equals: self clientId.
+	self assert: event request uri equals: self request uri.
+	self assert: event request method equals: self request method.
+	self assert: event response code equals: self response code.
+	self assert: event duration equals: self timing requestDuration + self timing responseDuration.
+	self assert: event printString isString.
+	^ event

repository/Zinc-Tests.package/ZnLogEventTest.class/instance/testServerTransactionEvent.st

@@ -0,0 +1,18 @@
+testing
+testServerTransactionEvent
+	| event |
+	(event := ZnServerTransactionEvent new)
+		serverId: self serverId;
+		request: self request;
+		response: self response;
+		timing: self timing.
+	self assert: event id isInteger.
+	self assert: event processId isInteger.
+	self assert: event timestamp <= DateAndTime now.
+	self assert: event serverId equals: self serverId.
+	self assert: event request uri equals: self request uri.
+	self assert: event request method equals: self request method.
+	self assert: event response code equals: self response code.
+	self assert: event duration equals: self timing totalDuration.
+	self assert: event printString isString.
+	^ event

repository/Zinc-Tests.package/ZnLogEventTest.class/instance/testSimplifiedClientTransactionEvent.st

@@ -0,0 +1,20 @@
+testing
+testSimplifiedClientTransactionEvent
+	| event |
+	(event := ZnSimplifiedClientTransactionEvent new)
+		clientId: self clientId;
+		request: self request;
+		response: self response;
+		requestDuration: self timing requestDuration;
+		responseDuration: self timing responseDuration.
+	self assert: event id isInteger.
+	self assert: event processId isInteger.
+	self assert: event timestamp <= DateAndTime now.
+	self assert: event clientId equals: self clientId.
+	self assert: event url equals: self request uri.
+	self assert: event method equals: self request method.
+	self assert: event responseCode equals: self response code.
+	self assert: event size equals: self response contentLength.
+	self assert: event duration equals: self timing requestDuration + self timing responseDuration.
+	self assert: event printString isString.
+	^ event

repository/Zinc-Tests.package/ZnLogEventTest.class/instance/testSimplifiedServerTransactionEvent.st

@@ -0,0 +1,19 @@
+testing
+testSimplifiedServerTransactionEvent
+	| event |
+	(event := ZnSimplifiedServerTransactionEvent new)
+		serverId: self serverId;
+		request: self request;
+		response: self response;
+		timing: self timing.
+	self assert: event id isInteger.
+	self assert: event processId isInteger.
+	self assert: event timestamp <= DateAndTime now.
+	self assert: event serverId equals: self serverId.
+	self assert: event url equals: self request uri.
+	self assert: event method equals: self request method.
+	self assert: event responseCode equals: self response code.
+	self assert: event size equals: self response contentLength.
+	self assert: event duration equals: self timing totalDuration.
+	self assert: event printString isString.
+	^ event

repository/Zinc-Tests.package/ZnLogEventTest.class/instance/timing.st

@@ -0,0 +1,6 @@
+accessing
+timing
+	^ ZnServerTransactionTiming new
+			requestDuration: 1;
+			responseDuration: 2;
+			yourself

repository/Zinc-Tests.package/ZnUnixSocketClientTest.class/properties.json → repository/Zinc-Tests.package/ZnLogEventTest.class/properties.json

@@ -6,6 +6,6 @@
 	"pools" : [ ],
 	"classvars" : [ ],
 	"instvars" : [ ],
-	"name" : "ZnUnixSocketClientTest",
+	"name" : "ZnLogEventTest",
 	"type" : "normal"
 }