From efdb296468d1f7b82522cde41161a536aa0c7ab6 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 30 Apr 2016 15:02:04 +0000
Subject: [PATCH] SAM: Log tweaks (ticket #1778)
---
apps/sam/java/src/net/i2p/sam/SAMv1Handler.java | 10 ++++------
apps/sam/java/src/net/i2p/sam/SAMv3Handler.java | 11 ++++-------
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java b/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
index 92c0384e5a..f91db2dd84 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
@@ -308,18 +308,16 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece
return writeString(SESSION_ERROR, "Unrecognized opcode");
}
} catch (DataFormatException e) {
- if (_log.shouldLog(Log.DEBUG))
- _log.debug("Invalid destination specified");
+ _log.error("Invalid SAM destination specified", e);
return writeString("SESSION STATUS RESULT=INVALID_KEY", e.getMessage());
} catch (I2PSessionException e) {
- if (_log.shouldLog(Log.DEBUG))
- _log.debug("I2P error when instantiating session", e);
+ _log.error("Failed to start SAM session", e);
return writeString(SESSION_ERROR, e.getMessage());
} catch (SAMException e) {
- _log.error("Unexpected SAM error", e);
+ _log.error("Failed to start SAM session", e);
return writeString(SESSION_ERROR, e.getMessage());
} catch (IOException e) {
- _log.error("Unexpected IOException", e);
+ _log.error("Failed to start SAM session", e);
return writeString(SESSION_ERROR, e.getMessage());
}
}
diff --git a/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java b/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java
index 70a7475f15..0b91818622 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java
@@ -542,19 +542,16 @@ class SAMv3Handler extends SAMv1Handler
return writeString(SESSION_ERROR, "Unrecognized opcode");
}
} catch (DataFormatException e) {
- if (_log.shouldLog(Log.DEBUG))
- _log.debug("Invalid destination specified");
+ _log.error("Invalid SAM destination specified", e);
return writeString("SESSION STATUS RESULT=INVALID_KEY", e.getMessage());
} catch (I2PSessionException e) {
- if (_log.shouldLog(Log.DEBUG))
- _log.debug("I2P error when instantiating session", e);
+ _log.error("Failed to start SAM session", e);
return writeString(SESSION_ERROR, e.getMessage());
} catch (SAMException e) {
- if (_log.shouldLog(Log.INFO))
- _log.info("Funny SAM error", e);
+ _log.error("Failed to start SAM session", e);
return writeString(SESSION_ERROR, e.getMessage());
} catch (IOException e) {
- _log.error("Unexpected IOException", e);
+ _log.error("Failed to start SAM session", e);
return writeString(SESSION_ERROR, e.getMessage());
} finally {
// unregister the session if it has not been created
--
GitLab