#BUGFIX by cg
class: MiniLogger class
fixed encoding to codepage on Windows
comment/format in: #log:severity:facility:originator:attachment:
changed:
#basicLog:severity:facility:originator:attachment:
#log:severity:originator:
--- a/MiniLogger.st Tue Feb 04 12:33:18 2020 +0100
+++ b/MiniLogger.st Tue Feb 04 13:08:50 2020 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"
COPYRIGHT (c) 2012-2014 by Jan Vrany & eXept Software AG
All Rights Reserved
@@ -613,7 +615,7 @@
!
log:message severity:severityOrSymbol facility:facilityArg originator:originator attachment:attachment
- "Pricipal logging method. This mimics VM __stxLog__()"
+ "Pricipal logging method. This mimics VM's __stxLog__()"
| severity messageXlated prevLogOnTranscript facility severityName words secondWord|
@@ -737,7 +739,7 @@
Logger log:'test message' severity: DEBUG facility: 'TEST'
Logger log:'test message' severity: INFO facility: 'TEST'
Logger log:'test message' asUnicode16String severity: INFO facility: 'TEST'
- Logger log:'test message äöüß' severity: INFO facility: 'TEST'
+ Logger log:'test message äöüß' severity: INFO facility: 'TEST'
Logger log:'test message' severity: WARNING facility: 'TEST'
Logger log:'test message' severity: ERROR facility: 'TEST'
'test message' infoPrintCR
@@ -775,6 +777,7 @@
severity:severity
facility:(self facilityOf:originator)
originator:originator
+ attachment:nil
"Created: / 15-09-2011 / 10:26:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 15-03-2013 / 11:20:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -1677,12 +1680,11 @@
!MiniLogger class methodsFor:'private'!
basicLog: message severity: severity facility: facility originator: originator attachment: attachment
- "Principal logging method. This mimics VM __stxLog__()"
+ "Principal logging method. This mimics VM's __stxLog__()"
|messageAsSent|
- (LogOnStderr not
- or:[Stderr isNil]) ifTrue:[
+ (LogOnStderr not or:[Stderr isNil]) ifTrue:[
^ self.
].
@@ -1698,13 +1700,7 @@
"/ we have to recode the message using locale-specific encoding
Stderr isExternalStream ifTrue:[
messageAsSent := messageAsSent string. "take care of Texts"
- messageAsSent containsNon7BitAscii ifTrue:[
- OperatingSystem isMSWINDOWSlike ifTrue:[
- messageAsSent := messageAsSent utf8Encoded.
- ] ifFalse:[
- messageAsSent := OperatingSystem encodeTerminalOutput:messageAsSent.
- ].
- ].
+ messageAsSent := OperatingSystem encodeTerminalOutput:messageAsSent.
messageAsSent _errorPrintCR.
"/ [
"/ Stderr nextPutLine: messageAsSent