Prepend originator class name to log messages.
--- a/MiniLogger.st Tue Dec 02 11:23:17 2014 +0100
+++ b/MiniLogger.st Tue Dec 02 11:57:01 2014 +0100
@@ -264,27 +264,24 @@
!MiniLogger class methodsFor:'logging'!
log: message
- self log: message severity: DEBUG
+ self log: message severity: DEBUG originator: thisContext sender receiver.
"Created: / 15-09-2011 / 10:27:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 13-08-2014 / 14:12:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 02-12-2014 / 10:52:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
log: message facility: facility
- self log: message severity: DEBUG facility: facility
+ self log: message severity: DEBUG facility: facility originator: thisContext sender receiver
"Created: / 14-09-2011 / 21:22:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 13-08-2014 / 14:12:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 02-12-2014 / 10:53:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
log: message severity: severity
- | originator |
-
- originator := thisContext sender receiver.
- self log: message severity: severity originator: originator
+ self log: message severity: severity originator: thisContext sender receiver
"Created: / 15-09-2011 / 10:25:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 26-08-2014 / 08:23:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 02-12-2014 / 10:53:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
log: message severity: severity attachment: attachment
@@ -349,6 +346,7 @@
"/ if not, issue an error
(Severities includesIdentical: severityXlated) ifFalse:[
| caller |
+
self log: ('no such severity (%1), use one from predefined severities. Original message will be logged as INFO' bindWith: severityXlated) severity: ERROR facility: 'STX' originator: self.
caller := thisContext sender.
[ caller notNil and: [ caller receiver ~~ originator ] ] whileTrue:[ caller := caller sender ].
@@ -370,6 +368,7 @@
"Created: / 14-09-2011 / 21:18:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 09-10-2014 / 09:22:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified (format): / 02-12-2014 / 10:48:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
log: message severity: severity originator: originator
@@ -383,188 +382,254 @@
debug: message
DEBUG value < Threshold value ifTrue:[ ^ self ].
- self log: message severity: DEBUG
+ self log: message severity: DEBUG originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:54:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
debug: format with: arg1
DEBUG value < Threshold value ifTrue:[ ^ self ].
- self log: (format bindWith: arg1) severity: DEBUG
+ self log: (format bindWith: arg1) severity: DEBUG originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:54:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
debug: format with: arg1 with: arg2
DEBUG value < Threshold value ifTrue:[ ^ self ].
- self log: (format bindWith: arg1 with: arg2) severity: DEBUG
+ self log: (format bindWith: arg1 with: arg2) severity: DEBUG originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:54:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
enter: message
ENTER value < Threshold value ifTrue:[ ^ self ].
- self log: message severity: ENTER
+ self log: message severity: ENTER originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:54:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
enter: format with: arg1
ENTER value < Threshold value ifTrue:[ ^ self ].
- self log: (format bindWith: arg1) severity: ENTER
+ self log: (format bindWith: arg1) severity: ENTER originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:54:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
enter: format with: arg1 with: arg2
ENTER value < Threshold value ifTrue:[ ^ self ].
- self log: (format bindWith: arg1 with: arg2) severity: ENTER
+ self log: (format bindWith: arg1 with: arg2) severity: ENTER originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:54:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
error: message
ERROR value < Threshold value ifTrue:[ ^ self ].
- self log: message severity: ERROR
+ self log: message severity: ERROR originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:54:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
error: format with: arg1
ERROR value < Threshold value ifTrue:[ ^ self ].
- self log: (format bindWith: arg1) severity: ERROR
+ self log: (format bindWith: arg1) severity: ERROR originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:54:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
error: format with: arg1 with: arg2
ERROR value < Threshold value ifTrue:[ ^ self ].
- self log: (format bindWith: arg1 with: arg2) severity: ERROR
+ self log: (format bindWith: arg1 with: arg2) severity: ERROR originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:54:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
fatal: message
FATAL value < Threshold value ifTrue:[ ^ self ].
- self log: message severity: FATAL
+ self log: message severity: FATAL originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:54:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
fatal: format with: arg1
FATAL value < Threshold value ifTrue:[ ^ self ].
- self log: (format bindWith: arg1) severity: FATAL
+ self log: (format bindWith: arg1) severity: FATAL originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:54:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
fatal: format with: arg1 with: arg2
FATAL value < Threshold value ifTrue:[ ^ self ].
- self log: (format bindWith: arg1 with: arg2) severity: FATAL
+ self log: (format bindWith: arg1 with: arg2) severity: FATAL originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:54:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
info: message
INFO value < Threshold value ifTrue:[ ^ self ].
- self log: message severity: INFO
+ self log: message severity: INFO originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:55:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
info: format with: arg1
INFO value < Threshold value ifTrue:[ ^ self ].
- self log: (format bindWith: arg1) severity: INFO
+ self log: (format bindWith: arg1) severity: INFO originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:55:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
info: format with: arg1 with: arg2
INFO value < Threshold value ifTrue:[ ^ self ].
- self log: (format bindWith: arg1 with: arg2) severity: INFO
+ self log: (format bindWith: arg1 with: arg2) severity: INFO originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:55:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
leave: message
LEAVE value < Threshold value ifTrue:[ ^ self ].
- self log: message severity: LEAVE
+ self log: message severity: LEAVE originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:55:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
leave: format with: arg1
LEAVE value < Threshold value ifTrue:[ ^ self ].
- self log: (format bindWith: arg1) severity: LEAVE
+ self log: (format bindWith: arg1) severity: LEAVE originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:55:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
leave: format with: arg1 with: arg2
LEAVE value < Threshold value ifTrue:[ ^ self ].
- self log: (format bindWith: arg1 with: arg2) severity: LEAVE
+ self log: (format bindWith: arg1 with: arg2) severity: LEAVE originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:55:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
trace0: message
TRACE0 value < Threshold value ifTrue:[ ^ self ].
- self log: message severity: TRACE0
+ self log: message severity: TRACE0 originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:55:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
trace0: format with: arg1
TRACE0 value < Threshold value ifTrue:[ ^ self ].
- self log: (format bindWith: arg1) severity: TRACE0
+ self log: (format bindWith: arg1) severity: TRACE0 originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:55:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
trace0: format with: arg1 with: arg2
TRACE0 value < Threshold value ifTrue:[ ^ self ].
- self log: (format bindWith: arg1 with: arg2) severity: TRACE0
+ self log: (format bindWith: arg1 with: arg2) severity: TRACE0 originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:55:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
trace1: message
TRACE1 value < Threshold value ifTrue:[ ^ self ].
- self log: message severity: TRACE1
+ self log: message severity: TRACE1 originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:55:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
trace1: format with: arg1
TRACE1 value < Threshold value ifTrue:[ ^ self ].
- self log: (format bindWith: arg1) severity: TRACE1
+ self log: (format bindWith: arg1) severity: TRACE1 originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:55:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
trace1: format with: arg1 with: arg2
TRACE1 value < Threshold value ifTrue:[ ^ self ].
- self log: (format bindWith: arg1 with: arg2) severity: TRACE1
+ self log: (format bindWith: arg1 with: arg2) severity: TRACE1 originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:55:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
trace2: message
TRACE2 value < Threshold value ifTrue:[ ^ self ].
- self log: message severity: TRACE2
+ self log: message severity: TRACE2 originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:55:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
trace2: format with: arg1
TRACE2 value < Threshold value ifTrue:[ ^ self ].
- self log: (format bindWith: arg1) severity: TRACE2
+ self log: (format bindWith: arg1) severity: TRACE2 originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:55:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
trace2: format with: arg1 with: arg2
TRACE2 value < Threshold value ifTrue:[ ^ self ].
- self log: (format bindWith: arg1 with: arg2) severity: TRACE2
+ self log: (format bindWith: arg1 with: arg2) severity: TRACE2 originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:55:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
trace3: message
TRACE3 value < Threshold value ifTrue:[ ^ self ].
- self log: message severity: TRACE3
+ self log: message severity: TRACE3 originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:55:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
trace3: format with: arg1
TRACE3 value < Threshold value ifTrue:[ ^ self ].
- self log: (format bindWith: arg1) severity: TRACE3
+ self log: (format bindWith: arg1) severity: TRACE3 originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:55:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
trace3: format with: arg1 with: arg2
TRACE3 value < Threshold value ifTrue:[ ^ self ].
- self log: (format bindWith: arg1 with: arg2) severity: TRACE3
+ self log: (format bindWith: arg1 with: arg2) severity: TRACE3 originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:56:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
trace: message
TRACE value < Threshold value ifTrue:[ ^ self ].
- self log: message severity: TRACE
+ self log: message severity: TRACE originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:56:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
trace: format with: arg1
TRACE value < Threshold value ifTrue:[ ^ self ].
- self log: (format bindWith: arg1) severity: TRACE
+ self log: (format bindWith: arg1) severity: TRACE originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:56:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
trace: format with: arg1 with: arg2
TRACE value < Threshold value ifTrue:[ ^ self ].
- self log: (format bindWith: arg1 with: arg2) severity: TRACE
+ self log: (format bindWith: arg1 with: arg2) severity: TRACE originator: thisContext sender receiver
+
+ "Modified: / 02-12-2014 / 10:56:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
warning: message
WARN value < Threshold value ifTrue:[ ^ self ].
- self log: message severity: WARN
+ self log: message severity: WARN originator: thisContext sender receiver
- "Modified: / 25-09-2014 / 10:04:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 02-12-2014 / 10:56:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
warning: format with: arg1
WARN value < Threshold value ifTrue:[ ^ self ].
- self log: (format bindWith: arg1) severity: WARN
+ self log: (format bindWith: arg1) severity: WARN originator: thisContext sender receiver
- "Modified: / 25-09-2014 / 10:04:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 02-12-2014 / 10:56:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
warning: format with: arg1 with: arg2
WARN value < Threshold value ifTrue:[ ^ self ].
- self log: (format bindWith: arg1 with: arg2) severity: WARN
+ self log: (format bindWith: arg1 with: arg2) severity: WARN originator: thisContext sender receiver
- "Modified: / 25-09-2014 / 10:04:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 02-12-2014 / 10:56:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!MiniLogger class methodsFor:'private'!
@@ -619,6 +684,8 @@
Timestamp now printOn:aStream format:'%(year)-%(mon)-%(day) %h:%m:%s.%i'.
aStream nextPut:$).
aStream space.
+ originator class name printOn: aStream.
+ aStream nextPutAll: ': '.
aStream nextPutAll: messageProperlyEncoded.
aStream cr.
@@ -627,7 +694,7 @@
"
"Created: / 14-09-2011 / 21:18:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 09-10-2014 / 10:47:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 02-12-2014 / 10:50:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!MiniLogger::Severity methodsFor:'accessing'!
@@ -662,11 +729,11 @@
!MiniLogger class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/MiniLogger.st,v 1.12 2014-11-18 15:09:38 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/MiniLogger.st,v 1.13 2014-12-02 10:57:01 vrany Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic/MiniLogger.st,v 1.12 2014-11-18 15:09:38 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/MiniLogger.st,v 1.13 2014-12-02 10:57:01 vrany Exp $'
!
version_HG
@@ -675,7 +742,7 @@
!
version_SVN
- ^ '$Id: MiniLogger.st,v 1.12 2014-11-18 15:09:38 stefan Exp $'
+ ^ '$Id: MiniLogger.st,v 1.13 2014-12-02 10:57:01 vrany Exp $'
! !