Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 20:29:52 +01:00
Code Issues Projects Releases Wiki Activity

Add utility method for logging exceptions.

Browse Source
This commit is contained in:
akwizgran
2018-06-15 17:09:33 +01:00
parent b026031d66
commit d5d6db6723
85 changed files with 327 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java
View File

@@ -63,6 +63,7 @@ import okhttp3.ResponseBody;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.logging.Level.WARNING;
import static org.briarproject.bramble.util.LogUtils.logException;
import static org.briarproject.briar.api.blog.BlogConstants.MAX_BLOG_POST_BODY_LENGTH;
import static org.briarproject.briar.api.feed.FeedConstants.FETCH_DELAY_INITIAL;
import static org.briarproject.briar.api.feed.FeedConstants.FETCH_INTERVAL;
@@ -284,8 +285,7 @@ class FeedManagerImpl implements FeedManager, Client, EventListener,
try {
feeds = getFeeds();
} catch (DbException e) {
if (LOG.isLoggable(WARNING))
LOG.log(WARNING, e.toString(), e);
logException(LOG, WARNING, e);
return;
}
@@ -295,8 +295,7 @@ class FeedManagerImpl implements FeedManager, Client, EventListener,
try {
newFeeds.add(fetchFeed(feed));
} catch (IOException | DbException e) {
if (LOG.isLoggable(WARNING))
LOG.log(WARNING, e.toString(), e);
logException(LOG, WARNING, e);
newFeeds.add(feed);
}
}
@@ -305,8 +304,7 @@ class FeedManagerImpl implements FeedManager, Client, EventListener,
try {
storeFeeds(newFeeds);
} catch (DbException e) {
if (LOG.isLoggable(WARNING))
LOG.log(WARNING, e.toString(), e);
logException(LOG, WARNING, e);
}
LOG.info("Done updating RSS feeds");
}
@@ -464,13 +462,11 @@ class FeedManagerImpl implements FeedManager, Client, EventListener,
.createBlogPost(groupId, time, null, localAuthor, body);
blogManager.addLocalPost(txn, post);
} catch (DbException | GeneralSecurityException | FormatException e) {
if (LOG.isLoggable(WARNING))
LOG.log(WARNING, e.toString(), e);
logException(LOG, WARNING, e);
} catch (IllegalArgumentException e) {
// yes even catch this, so we at least get a stacktrace
// and the executor doesn't just die a silent death
if (LOG.isLoggable(WARNING))
LOG.log(WARNING, e.toString(), e);
logException(LOG, WARNING, e);
}
}

4
briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeProtocolEngine.java
View File

@@ -40,6 +40,7 @@ import javax.annotation.concurrent.Immutable;
import javax.inject.Inject;
import static java.util.logging.Level.WARNING;
import static org.briarproject.bramble.util.LogUtils.logException;
import static org.briarproject.briar.api.introduction.Role.INTRODUCEE;
import static org.briarproject.briar.introduction.IntroduceeState.AWAIT_AUTH;
import static org.briarproject.briar.introduction.IntroduceeState.AWAIT_RESPONSES;
@@ -412,8 +413,7 @@ class IntroduceeProtocolEngine
mac = crypto.authMac(ourMacKey, s, localAuthor.getId());
signature = crypto.sign(ourMacKey, localAuthor.getPrivateKey());
} catch (GeneralSecurityException e) {
if (LOG.isLoggable(WARNING))
LOG.log(WARNING, e.toString(), e);
logException(LOG, WARNING, e);
return abort(txn, s);
}
if (s.getState() != AWAIT_AUTH) throw new AssertionError();

3
briar-core/src/main/java/org/briarproject/briar/test/TestDataCreatorImpl.java
View File

@@ -124,8 +124,7 @@ public class TestDataCreatorImpl implements TestDataCreator {
createTestDataOnIoExecutor(numContacts, numPrivateMsgs,
numBlogPosts, numForums, numForumPosts);
} catch (DbException e) {
if (LOG.isLoggable(WARNING))
LOG.log(WARNING, "Creating test data failed", e);
LOG.log(WARNING, "Creating test data failed", e);
}
});
}