Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
joram
joram
Commits
f471001c
Commit
f471001c
authored
Jan 28, 2021
by
Andre Freyssinet
Browse files
Logging enhancements.
parent
ac30755b
Changes
3
Hide whitespace changes
Inline
Side-by-side
joram/joram/client/jms/src/main/java/org/objectweb/joram/client/jms/Session.java
View file @
f471001c
...
...
@@ -1617,18 +1617,16 @@ public class Session implements javax.jms.Session, SessionMBean {
if
(
logger
.
isLoggable
(
BasicLevel
.
DEBUG
))
logger
.
log
(
BasicLevel
.
DEBUG
,
this
+
": committed."
);
}
// Catching an exception if the sendings or acknowledgement went wrong:
catch
(
JMSException
jE
)
{
if
(
logger
.
isLoggable
(
BasicLevel
.
ERROR
))
logger
.
log
(
BasicLevel
.
ERROR
,
""
,
jE
);
TransactionRolledBackException
tE
=
new
TransactionRolledBackException
(
"A JMSException was thrown during the commit."
);
}
catch
(
JMSException
jE
)
{
// Catching an exception if the sendings or acknowledgement went wrong:
if
(
logger
.
isLoggable
(
BasicLevel
.
DEBUG
))
logger
.
log
(
BasicLevel
.
ERROR
,
"A JMSException was thrown during the commit"
,
jE
);
else
logger
.
log
(
BasicLevel
.
ERROR
,
"A JMSException was thrown during the commit: "
+
jE
.
getMessage
());
TransactionRolledBackException
tE
=
new
TransactionRolledBackException
(
"A JMSException was thrown during the commit."
);
tE
.
setLinkedException
(
jE
);
if
(
logger
.
isLoggable
(
BasicLevel
.
ERROR
))
logger
.
log
(
BasicLevel
.
ERROR
,
"Exception: "
+
tE
);
rollback
();
throw
tE
;
}
...
...
joram/joram/mom/extensions/jmsbridge/src/main/java/org/objectweb/joram/mom/dest/jms/JMSAcquisition.java
View file @
f471001c
...
...
@@ -217,7 +217,7 @@ public class JMSAcquisition implements AcquisitionDaemon {
*/
public
void
onMessage
(
javax
.
jms
.
Message
jmsMessage
)
{
if
(
logger
.
isLoggable
(
BasicLevel
.
DEBUG
))
logger
.
log
(
BasicLevel
.
DEBUG
,
connection
.
getName
()
+
".onMessage("
+
jmsMessage
+
')'
);
logger
.
log
(
BasicLevel
.
DEBUG
,
"JMSAcquisition["
+
connection
.
getName
()
+
"
]
.onMessage("
+
jmsMessage
+
')'
);
try
{
org
.
objectweb
.
joram
.
client
.
jms
.
Message
clientMessage
=
null
;
...
...
@@ -226,10 +226,12 @@ public class JMSAcquisition implements AcquisitionDaemon {
org
.
objectweb
.
joram
.
client
.
jms
.
Message
.
prepareJMSMessage
(
clientMessage
);
}
catch
(
JMSException
conversionExc
)
{
// Conversion error: denying the message.
if
(
logger
.
isLoggable
(
BasicLevel
.
WARN
))
if
(
logger
.
isLoggable
(
BasicLevel
.
DEBUG
))
logger
.
log
(
BasicLevel
.
WARN
,
"JMSAcquisition["
+
connection
.
getName
()
+
"].onMessage, rollback, can not convert message."
,
conversionExc
);
else
logger
.
log
(
BasicLevel
.
WARN
,
connection
.
getName
()
+
".onMessage: rollback, can not convert message."
,
conversionExc
);
"JMSAcquisition["
+
connection
.
getName
()
+
"].onMessage, rollback, can not convert message: "
+
conversionExc
.
getMessage
());
session
.
rollback
();
return
;
...
...
@@ -237,23 +239,28 @@ public class JMSAcquisition implements AcquisitionDaemon {
transmitter
.
transmit
(
clientMessage
.
getMomMsg
(),
jmsMessage
.
getJMSMessageID
());
if
(
logger
.
isLoggable
(
BasicLevel
.
DEBUG
))
logger
.
log
(
BasicLevel
.
DEBUG
,
connection
.
getName
()
+
".onMessage: Try to commit."
);
logger
.
log
(
BasicLevel
.
DEBUG
,
"JMSAcquisition["
+
connection
.
getName
()
+
"
]
.onMessage: Try to commit."
);
session
.
commit
();
}
catch
(
JMSException
exc
)
{
// Commit or rollback failed: nothing to do.
logger
.
log
(
BasicLevel
.
ERROR
,
connection
.
getName
()
+
".onMessage("
+
jmsMessage
+
')'
,
exc
);
if
(
logger
.
isLoggable
(
BasicLevel
.
DEBUG
))
logger
.
log
(
BasicLevel
.
ERROR
,
"JMSAcquisition["
+
connection
.
getName
()
+
"].onMessage("
+
jmsMessage
+
')'
,
exc
);
else
logger
.
log
(
BasicLevel
.
ERROR
,
"JMSAcquisition["
+
connection
.
getName
()
+
"].onMessage("
+
jmsMessage
+
"): "
+
exc
.
getMessage
());
}
catch
(
Throwable
t
)
{
logger
.
log
(
BasicLevel
.
ERROR
,
connection
.
getName
()
+
".onMessage("
+
jmsMessage
+
')'
,
t
);
if
(
logger
.
isLoggable
(
BasicLevel
.
DEBUG
))
logger
.
log
(
BasicLevel
.
ERROR
,
"JMSAcquisition["
+
connection
.
getName
()
+
"].onMessage("
+
jmsMessage
+
')'
,
t
);
else
logger
.
log
(
BasicLevel
.
ERROR
,
"JMSAcquisition["
+
connection
.
getName
()
+
"].onMessage("
+
jmsMessage
+
"): "
+
t
.
getMessage
());
}
}
public
void
onException
(
JMSException
exception
)
{
if
(
logger
.
isLoggable
(
BasicLevel
.
DEBUG
))
{
logger
.
log
(
BasicLevel
.
DEBUG
,
connection
.
getName
()
+
": Consumer error for session "
+
session
);
}
if
(
logger
.
isLoggable
(
BasicLevel
.
DEBUG
))
logger
.
log
(
BasicLevel
.
WARN
,
"JMSAcquisition["
+
connection
.
getName
()
+
"]: Consumer error for session "
+
session
,
exception
);
else
logger
.
log
(
BasicLevel
.
WARN
,
"JMSAcquisition["
+
connection
.
getName
()
+
"]: Consumer error for session "
+
session
,
exception
);
if
(!
closing
)
{
listeners
.
remove
(
connection
.
getName
());
}
...
...
joram/joram/mom/extensions/jmsbridge/src/main/java/org/objectweb/joram/mom/dest/jms/JMSModule.java
View file @
f471001c
...
...
@@ -351,9 +351,10 @@ public class JMSModule implements ExceptionListener, Serializable, JMSModuleMBea
* Reacts by launching a reconnection process.
*/
public
void
onException
(
JMSException
exc
)
{
if
(
logger
.
isLoggable
(
BasicLevel
.
WARN
))
{
if
(
logger
.
isLoggable
(
BasicLevel
.
DEBUG
))
logger
.
log
(
BasicLevel
.
WARN
,
"JMSModule.onException()"
,
exc
);
}
else
logger
.
log
(
BasicLevel
.
WARN
,
"JMSModule.onException(): "
+
exc
.
getMessage
());
if
(
listeners
!=
null
)
{
for
(
Iterator
<
JmsListener
>
listener
=
listeners
.
iterator
();
listener
.
hasNext
();)
{
...
...
@@ -368,7 +369,10 @@ public class JMSModule implements ExceptionListener, Serializable, JMSModuleMBea
try
{
cnx
.
close
();
}
catch
(
JMSException
exc2
)
{
logger
.
log
(
BasicLevel
.
INFO
,
"JMSModule.onException(), error closing the connection"
,
exc2
);
if
(
logger
.
isLoggable
(
BasicLevel
.
DEBUG
))
logger
.
log
(
BasicLevel
.
INFO
,
"JMSModule.onException(), error closing the connection"
,
exc2
);
else
logger
.
log
(
BasicLevel
.
INFO
,
"JMSModule.onException(), error closing the connection: "
+
exc2
.
getMessage
());
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment