smalltalk
/
osmo-st-network
Archived
1
0
Fork 0
Code Releases Activity

osmo: Add hostname/port to the error messages

This commit is contained in:
Holger Hans Peter Freyther 2013-08-19 13:23:36 +02:00
parent 108ff0b0b1
commit 92add56e05
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
osmo/OsmoStreamSocketBase.st
View File

@ -48,6 +48,15 @@ supervising the RX/TX process and re-starting.'>
^port ^port
] ]
targetDescription [
<category: 'accessing'>
^(WriteStream on: String new)
nextPutAll: hostname;
nextPut: $:;
nextPutAll: port asString;
contents
]
connect [ connect [
<category: 'connect'> <category: 'connect'>
socket ifNotNil: [socket close]. socket ifNotNil: [socket close].
@ -59,16 +68,18 @@ supervising the RX/TX process and re-starting.'>
started := true. started := true.
[ [
self logNotice: 'Attempting to connect' area: #osmo. self logNotice: ('Attempting to connect to ',
self targetDescription) area: #osmo.
self connect self connect
] on: self class connectionException do: [ ] on: self class connectionException do: [
self logError: 'Failed to connect.' area: #osmo. self logError: ('Failed to connect to ',
self targetDescription) area: #osmo.
^Osmo.TimerScheduler instance scheduleInSeconds: 1 block: [self reconnect]]. ^Osmo.TimerScheduler instance scheduleInSeconds: 1 block: [self reconnect]].
rx_proc := rx_proc :=
[Processor activeProcess name: 'OsmoAppConnection-RX'. [Processor activeProcess name: 'OsmoAppConnection-RX ', self targetDescription.
[self driveDispatch] repeat] fork. [self driveDispatch] repeat] fork.
tx_proc := [Processor activeProcess name: 'OsmoAppConnection-TX'. tx_proc := [Processor activeProcess name: 'OsmoAppConnection-TX ', self targetDescription.
[self driveSend] repeat] fork [self driveSend] repeat] fork
] ]
@ -93,13 +104,16 @@ supervising the RX/TX process and re-starting.'>
[ [
self dispatchOne self dispatchOne
] on: SystemExceptions.EndOfStream do: [:e | ] on: SystemExceptions.EndOfStream do: [:e |
self logError: 'OsmoApplication eof' area: #osmo. self logError: ('OsmoApplication dispatch eof on ',
self targetDescription) area: #osmo.
self scheduleReconnect self scheduleReconnect
] on: SystemExceptions.FileError do: [:e | ] on: SystemExceptions.FileError do: [:e |
self logError: 'OsmoApplication file-error' area: #osmo. self logError: ('OsmoApplication dispatch file-error on ',
self targetDescription) area: #osmo.
self scheduleReconnect self scheduleReconnect
] on: Error do: [:e | ] on: Error do: [:e |
e logException: 'OsmoApplication error' area: #osmo. e logException: ('OsmoApplication dispatch error on ',
self targetDescription) area: #osmo.
self scheduleReconnect self scheduleReconnect
] ]
] ]
@ -109,17 +123,19 @@ supervising the RX/TX process and re-starting.'>
[ [
self sendOne self sendOne
] on: SystemExceptions.EndOfStream do: [:e | ] on: SystemExceptions.EndOfStream do: [:e |
self logError: 'OsmoApplication eof' area: #osmo. self logError: ('OsmoApplication send eof on ',
self targetDescription) area: #osmo.
self scheduleReconnect self scheduleReconnect
] on: Error do: [:e | ] on: Error do: [:e |
e logException: 'OsmoApplication error' area: #osmo. e logException: ('OsmoApplication send error on ',
self targetDescription) area: #osmo.
self scheduleReconnect self scheduleReconnect
] ]
] ]
reconnect [ reconnect [
<category: 'private'> <category: 'private'>
self logNotice: 'Going to reconnect socket' area: #osmo. self logNotice: ('Going to reconnect socket to ', self targetDescription) area: #osmo.
self terminate. self terminate.
started ifTrue: [self start] started ifTrue: [self start]
] ]