From 511b470aa49ca52bea20bcf355b852c1814a02e7 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Mon, 3 Mar 2014 15:31:46 +0000
Subject: [PATCH] Less verbose logging for plugins.
---
.../src/org/briarproject/plugins/tor/TorPlugin.java | 4 ++--
.../src/org/briarproject/plugins/tcp/TcpPlugin.java | 4 ++--
.../plugins/bluetooth/BluetoothPlugin.java | 11 +++++++----
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/briar-android/src/org/briarproject/plugins/tor/TorPlugin.java b/briar-android/src/org/briarproject/plugins/tor/TorPlugin.java
index 80ac29e959..6112889ffb 100644
--- a/briar-android/src/org/briarproject/plugins/tor/TorPlugin.java
+++ b/briar-android/src/org/briarproject/plugins/tor/TorPlugin.java
@@ -494,7 +494,7 @@ class TorPlugin implements DuplexPlugin, EventHandler {
s = ss.accept();
} catch(IOException e) {
// This is expected when the socket is closed
- if(LOG.isLoggable(INFO)) LOG.log(INFO, e.toString(), e);
+ if(LOG.isLoggable(INFO)) LOG.info(e.toString());
tryToClose(ss);
return;
}
@@ -584,7 +584,7 @@ class TorPlugin implements DuplexPlugin, EventHandler {
if(LOG.isLoggable(INFO)) LOG.info("Connected to " + onion);
return new TorTransportConnection(this, s);
} catch(IOException e) {
- if(LOG.isLoggable(INFO)) LOG.log(INFO, e.toString(), e);
+ if(LOG.isLoggable(INFO)) LOG.info("Could not connect to " + onion);
return null;
}
}
diff --git a/briar-core/src/org/briarproject/plugins/tcp/TcpPlugin.java b/briar-core/src/org/briarproject/plugins/tcp/TcpPlugin.java
index 13401c290c..10f9317432 100644
--- a/briar-core/src/org/briarproject/plugins/tcp/TcpPlugin.java
+++ b/briar-core/src/org/briarproject/plugins/tcp/TcpPlugin.java
@@ -129,7 +129,7 @@ abstract class TcpPlugin implements DuplexPlugin {
s = ss.accept();
} catch(IOException e) {
// This is expected when the socket is closed
- if(LOG.isLoggable(INFO)) LOG.log(INFO, e.toString(), e);
+ if(LOG.isLoggable(INFO)) LOG.info(e.toString());
tryToClose(ss);
return;
}
@@ -188,7 +188,7 @@ abstract class TcpPlugin implements DuplexPlugin {
if(LOG.isLoggable(INFO)) LOG.info("Connected to " + addr);
return new TcpTransportConnection(this, s);
} catch(IOException e) {
- if(LOG.isLoggable(INFO)) LOG.log(INFO, e.toString(), e);
+ if(LOG.isLoggable(INFO)) LOG.info("Could not connect to " + addr);
return null;
}
}
diff --git a/briar-desktop/src/org/briarproject/plugins/bluetooth/BluetoothPlugin.java b/briar-desktop/src/org/briarproject/plugins/bluetooth/BluetoothPlugin.java
index 4572df83e1..ba082128ba 100644
--- a/briar-desktop/src/org/briarproject/plugins/bluetooth/BluetoothPlugin.java
+++ b/briar-desktop/src/org/briarproject/plugins/bluetooth/BluetoothPlugin.java
@@ -154,7 +154,7 @@ class BluetoothPlugin implements DuplexPlugin {
s = ss.acceptAndOpen();
} catch(IOException e) {
// This is expected when the socket is closed
- if(LOG.isLoggable(INFO)) LOG.log(INFO, e.toString(), e);
+ if(LOG.isLoggable(INFO)) LOG.info(e.toString());
tryToClose(ss);
return;
}
@@ -208,10 +208,13 @@ class BluetoothPlugin implements DuplexPlugin {
}
private StreamConnection connect(String url) {
+ if(LOG.isLoggable(INFO)) LOG.info("Connecting to " + url);
try {
- return (StreamConnection) Connector.open(url);
+ StreamConnection s = (StreamConnection) Connector.open(url);
+ if(LOG.isLoggable(INFO)) LOG.info("Connected to " + url);
+ return s;
} catch(IOException e) {
- if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+ if(LOG.isLoggable(INFO)) LOG.info("Could not connect to " + url);
return null;
}
}
@@ -374,7 +377,7 @@ class BluetoothPlugin implements DuplexPlugin {
}
} catch(IOException e) {
// This is expected when the socket is closed
- if(LOG.isLoggable(INFO)) LOG.log(INFO, e.toString(), e);
+ if(LOG.isLoggable(INFO)) LOG.info(e.toString());
}
}
}
--
GitLab