From 7b894bbf0ffd7a0049024a2e64b85088396f2ae2 Mon Sep 17 00:00:00 2001 From: psquickitjayant Date: Tue, 4 Aug 2015 14:49:54 +0530 Subject: [PATCH 1/5] Updated LogglyTree.java to support appname --- .../tony19/timber/loggly/LogglyTree.java | 421 ++++++++++-------- 1 file changed, 230 insertions(+), 191 deletions(-) diff --git a/src/main/java/com/github/tony19/timber/loggly/LogglyTree.java b/src/main/java/com/github/tony19/timber/loggly/LogglyTree.java index 0cfae35..14f368e 100644 --- a/src/main/java/com/github/tony19/timber/loggly/LogglyTree.java +++ b/src/main/java/com/github/tony19/timber/loggly/LogglyTree.java @@ -21,201 +21,240 @@ import java.io.PrintWriter; import java.io.StringWriter; +import android.util.Log; + /** * A Timber tree that posts * log messages to Loggly * * @author tony19@gmail.com */ -public class LogglyTree extends Timber.HollowTree implements Timber.TaggedTree { - - private final LogglyClient loggly; - private LogglyClient.Callback handler; - - /** Log severity level */ - private enum Level { - DEBUG, - INFO, - WARN, - ERROR - } - - /** - * Creates a Timber - * tree for posting messages to Loggly - * @param token Loggly token from https://www.loggly.com/docs/customer-token-authentication-token/ - */ - public LogglyTree(String token) { - loggly = new LogglyClient(token); - - // Setup an async callback - // TODO: handle failed messages with N retries - handler = new LogglyClient.Callback() { - @Override - public void success() { - // XXX: Handle success - } - - @Override - public void failure(String error) { - System.err.println("LogglyTree failed: " + error); - } - }; - } - - /** - * Logs a message with {@code DEBUG} severity - * @param message message to be logged - * @param args message formatting arguments - */ - @Override - public void d(String message, Object... args) { - log(Level.DEBUG, message, args); - } - - /** - * Logs a message and an associated throwable with {@code DEBUG} severity - * @param t throwable to be logged - * @param message message to be logged - * @param args message formatting arguments - */ - @Override - public void d(Throwable t, String message, Object... args) { - log(Level.DEBUG, message, t, args); - } - - /** - * Logs a message with {@code INFO} severity - * @param message message to be logged - * @param args message formatting arguments - */ - @Override - public void i(String message, Object... args) { - log(Level.INFO, message, args); - } - - /** - * Logs a message and an associated throwable with {@code INFO} severity - * @param t throwable to be logged - * @param message message to be logged - * @param args message formatting arguments - */ - @Override - public void i(Throwable t, String message, Object... args) { - log(Level.INFO, message, t, args); - } - - /** - * Logs a message with {@code ERROR} severity - * @param message message to be logged - * @param args message formatting arguments - */ - @Override - public void e(String message, Object... args) { - log(Level.ERROR, message, args); - } - - /** - * Logs a message and an associated throwable with {@code ERROR} severity - * @param t throwable to be logged - * @param message message to be logged - * @param args message formatting arguments - */ - @Override - public void e(Throwable t, String message, Object... args) { - log(Level.ERROR, message, t, args); - } - - /** - * Logs a message with {@code WARN} severity - * @param message message to be logged - * @param args message formatting arguments - */ - @Override - public void w(String message, Object... args) { - log(Level.WARN, message, args); - } - - /** - * Logs a message and an associated throwable with {@code WARN} severity - * @param t throwable to be logged - * @param message message to be logged - * @param args message formatting arguments - */ - @Override - public void w(Throwable t, String message, Object... args) { - log(Level.WARN, message, t, args); - } - - /** - * Gets the JSON representation of a log event - * @param level log severity level - * @param message message to be logged - * @param args message formatting arguments - * @return JSON string - */ - private String toJson(Level level, String message, Object... args) { - return String.format("{\"level\": \"%1$s\", \"message\": \"%2$s\"}", - level, - String.format(message, args).replace("\"", "\\\"")); - } - - /** - * Converts a {@code Throwable} into a string - * http://stackoverflow.com/a/4812589/600838 - * @param t throwable to convert - * @return string representation of the throwable - */ - private String formatThrowable(Throwable t) { - StringWriter errors = new StringWriter(); - t.printStackTrace(new PrintWriter(errors)); - return errors.toString(); - } - - /** - * Gets the JSON representation of a log event - * @param level log severity level - * @param message message to be logged - * @param args message formatting arguments - * @return JSON string - */ - private String toJson(Level level, String message, Throwable t, Object... args) { - return String.format("{\"level\": \"%1$s\", \"message\": \"%2$s\", \"exception\": \"%3$s\"}", - level, - String.format(message, args).replace("\"", "\\\""), - formatThrowable(t)); - } - - /** - * Asynchronously sends a log event to Loggly - * @param level log severity level - * @param message message to be logged - * @param t throwable - * @param args message formatting arguments - */ - private void log(Level level, String message, Throwable t, Object... args) { - loggly.log(toJson(level, message, t, args), handler); - } - - /** - * Asynchronously sends a log event to Loggly - * @param level log severity level - * @param message message to be logged - * @param args message formatting arguments - */ - private void log(Level level, String message, Object... args) { - loggly.log(toJson(level, message, args), handler); - } - - /** - * Sets the Loggly tag for all logs going forward. This differs from - * the API of {@code Timber.TaggedTree} in that it's not a one-shot - * tag. - * @param tag desired tag or CSV of multiple tags; use empty string - * to clear tags - */ - @Override - public final void tag(String tag) { - loggly.setTags(tag); - } +public class LogglyTree extends Timber.Tree { + + private final LogglyClient loggly; + private LogglyClient.Callback handler; + private String appName; + private String[] LEVEL = { + "DEBUG", "INFO", "WARN", "ERROR" + }; + private final int DEBUG = 0, INFO = 1, WARN = 2, ERROR = 3; + + /** Log severity level */ + private enum Level { + DEBUG, + INFO, + WARN, + ERROR + } + + + /** + * Creates a Timber + * tree for posting messages to Loggly + * @param token Loggly token from https://www.loggly.com/docs/customer-token-authentication-token/ + */ + public LogglyTree(String token) { + loggly = new LogglyClient(token); + + // TODO: handle failed messages with N retries + handler = new LogglyClient.Callback() {@Override + public void success() { + + } + + @Override + public void failure(String error) { + System.err.println("LogglyTree failed: " + error); + + } + }; + } + + public LogglyTree(String token, String tag) { + loggly = new LogglyClient(token, tag); + // Setup an async callback + // TODO: handle failed messages with N retries + handler = new LogglyClient.Callback() {@Override + public void success() { + // XXX: Handle success + } + + @Override + public void failure(String error) { + System.err.println("LogglyTree failed: " + error); + } + }; + + } + + public LogglyTree(String token, String tag, String appName) { + loggly = new LogglyClient(token, tag); + this.appName = appName; + // Setup an async callback + // TODO: handle failed messages with N retries + handler = new LogglyClient.Callback() {@Override + public void success() { + // XXX: Handle success + } + + @Override + public void failure(String error) { + System.err.println("LogglyTree failed: " + error); + } + }; + } + + /** + * Logs a message with {@code DEBUG} severity + * @param message message to be logged + * @param args message formatting arguments + */@Override + public void d(String message, Object...args) { + log(DEBUG, message, args); + } + + /** + * Logs a message and an associated throwable with {@code DEBUG} severity + * @param t throwable to be logged + * @param message message to be logged + * @param args message formatting arguments + */@Override + public void d(Throwable t, String message, Object...args) { + log(DEBUG, message, t, args); + } + + /** + * Logs a message with {@code INFO} severity + * @param message message to be logged + * @param args message formatting arguments + */@Override + public void i(String message, Object...args) { + log(INFO, message, args); + } + + /** + * Logs a message and an associated throwable with {@code INFO} severity + * @param t throwable to be logged + * @param message message to be logged + * @param args message formatting arguments + */@Override + public void i(Throwable t, String message, Object...args) { + log(INFO, message, t, args); + } + + /** + * Logs a message with {@code ERROR} severity + * @param message message to be logged + * @param args message formatting arguments + */@Override + public void e(String message, Object...args) { + log(ERROR, message, args); + + } + + /** + * Logs a message and an associated throwable with {@code ERROR} severity + * @param t throwable to be logged + * @param message message to be logged + * @param args message formatting arguments + */@Override + public void e(Throwable t, String message, Object...args) { + log(ERROR, message, t, args); + } + + /** + * Logs a message with {@code WARN} severity + * @param message message to be logged + * @param args message formatting arguments + */@Override + public void w(String message, Object...args) { + log(WARN, message, args); + + } + + /** + * Logs a message and an associated throwable with {@code WARN} severity + * @param t throwable to be logged + * @param message message to be logged + * @param args message formatting arguments + */@Override + public void w(Throwable t, String message, Object...args) { + log(WARN, message, t, args); + + } + + /** + * Gets the JSON representation of a log event + * @param level log severity level + * @param message message to be logged + * @param args message formatting arguments + * @return JSON string + * + * + */ + + private String toJson(int level, String message, Object...args) { + return String.format("{\"level\": \"%1$s\", \"message\": \"%2$s\",\"appName\" : \"%3$s\"}", + LEVEL[level], + String.format(message, args).replace("\"", "\\\""), String.format(appName).replace("\"", "\\\"")); + } + + private String toJson(Level level, String message, Object...args) { + return String.format("{\"level\": \"%1$s\", \"message\": \"%2$s\",\"appName\" : \"%3$s\"}", + level, + String.format(message, args).replace("\"", "\\\""), String.format(appName).replace("\"", "\\\"")); + } + + /** + * Converts a {@code Throwable} into a string + * http://stackoverflow.com/a/4812589/600838 + * @param t throwable to convert + * @return string representation of the throwable + */ + private String formatThrowable(Throwable t) { + StringWriter errors = new StringWriter(); + t.printStackTrace(new PrintWriter(errors)); + return errors.toString(); + } + + /** + * Gets the JSON representation of a log event + * @param level log severity level + * @param message message to be logged + * @param args message formatting arguments + * @return JSON string + */ + private String toJson(Level level, String message, Throwable t, Object...args) { + return String.format("{\"level\": \"%1$s\", \"message\": \"%2$s\", \"exception\": \"%3$s\",\"appName\" : \"%4$s\"}", + level, + String.format(message, args).replace("\"", "\\\""), + formatThrowable(t), String.format(appName).replace("\"", "\\\"")); + } + + private String toJson(int level, String message, Throwable t, Object...args) { + return String.format("{\"level\": \"%1$s\", \"message\": \"%2$s\", \"exception\": \"%3$s\",\"appName\" : \"%4$s\"}", + LEVEL[level], + String.format(message, args).replace("\"", "\\\""), + formatThrowable(t), String.format(appName).replace("\"", "\\\"")); + + } + + + private void log(int level, String message, Object...args) { + loggly.log(toJson(level, message, args), handler); + } + + private void log(int level, String message, Throwable t, Object...args) { + loggly.log(toJson(level, message, t, args), handler); + } + + @Override + protected void log(int level, String tag, String message, Throwable t) { + // TODO Auto-generated method stub + loggly.log(toJson(level, tag, message, t), handler); + + } + + + } From 4976b3ad42d35ee9c5ccde494eaae28a85ac7096 Mon Sep 17 00:00:00 2001 From: psquickitjayant Date: Tue, 11 Aug 2015 14:29:01 +0530 Subject: [PATCH 2/5] Restored Whitespaces --- .../tony19/timber/loggly/LogglyTree.java | 447 +++++++++--------- 1 file changed, 223 insertions(+), 224 deletions(-) diff --git a/src/main/java/com/github/tony19/timber/loggly/LogglyTree.java b/src/main/java/com/github/tony19/timber/loggly/LogglyTree.java index 14f368e..2457406 100644 --- a/src/main/java/com/github/tony19/timber/loggly/LogglyTree.java +++ b/src/main/java/com/github/tony19/timber/loggly/LogglyTree.java @@ -26,234 +26,233 @@ /** * A Timber tree that posts * log messages to Loggly - * * @author tony19@gmail.com */ public class LogglyTree extends Timber.Tree { - private final LogglyClient loggly; - private LogglyClient.Callback handler; - private String appName; - private String[] LEVEL = { - "DEBUG", "INFO", "WARN", "ERROR" - }; - private final int DEBUG = 0, INFO = 1, WARN = 2, ERROR = 3; - - /** Log severity level */ - private enum Level { - DEBUG, - INFO, - WARN, - ERROR - } - - - /** - * Creates a Timber - * tree for posting messages to Loggly - * @param token Loggly token from https://www.loggly.com/docs/customer-token-authentication-token/ - */ - public LogglyTree(String token) { - loggly = new LogglyClient(token); - - // TODO: handle failed messages with N retries - handler = new LogglyClient.Callback() {@Override - public void success() { - - } - - @Override - public void failure(String error) { - System.err.println("LogglyTree failed: " + error); - - } - }; - } - - public LogglyTree(String token, String tag) { - loggly = new LogglyClient(token, tag); - // Setup an async callback - // TODO: handle failed messages with N retries - handler = new LogglyClient.Callback() {@Override - public void success() { - // XXX: Handle success - } - - @Override - public void failure(String error) { - System.err.println("LogglyTree failed: " + error); - } - }; - - } - - public LogglyTree(String token, String tag, String appName) { - loggly = new LogglyClient(token, tag); - this.appName = appName; - // Setup an async callback - // TODO: handle failed messages with N retries - handler = new LogglyClient.Callback() {@Override - public void success() { - // XXX: Handle success - } - - @Override - public void failure(String error) { - System.err.println("LogglyTree failed: " + error); - } - }; - } - - /** - * Logs a message with {@code DEBUG} severity - * @param message message to be logged - * @param args message formatting arguments - */@Override - public void d(String message, Object...args) { - log(DEBUG, message, args); - } - - /** - * Logs a message and an associated throwable with {@code DEBUG} severity - * @param t throwable to be logged - * @param message message to be logged - * @param args message formatting arguments - */@Override - public void d(Throwable t, String message, Object...args) { - log(DEBUG, message, t, args); - } - - /** - * Logs a message with {@code INFO} severity - * @param message message to be logged - * @param args message formatting arguments - */@Override - public void i(String message, Object...args) { - log(INFO, message, args); - } - - /** - * Logs a message and an associated throwable with {@code INFO} severity - * @param t throwable to be logged - * @param message message to be logged - * @param args message formatting arguments - */@Override - public void i(Throwable t, String message, Object...args) { - log(INFO, message, t, args); - } - - /** - * Logs a message with {@code ERROR} severity - * @param message message to be logged - * @param args message formatting arguments - */@Override - public void e(String message, Object...args) { - log(ERROR, message, args); - - } - - /** - * Logs a message and an associated throwable with {@code ERROR} severity - * @param t throwable to be logged - * @param message message to be logged - * @param args message formatting arguments - */@Override - public void e(Throwable t, String message, Object...args) { - log(ERROR, message, t, args); - } - - /** - * Logs a message with {@code WARN} severity - * @param message message to be logged - * @param args message formatting arguments - */@Override - public void w(String message, Object...args) { - log(WARN, message, args); - - } - - /** - * Logs a message and an associated throwable with {@code WARN} severity - * @param t throwable to be logged - * @param message message to be logged - * @param args message formatting arguments - */@Override - public void w(Throwable t, String message, Object...args) { - log(WARN, message, t, args); - - } - - /** - * Gets the JSON representation of a log event - * @param level log severity level - * @param message message to be logged - * @param args message formatting arguments - * @return JSON string - * - * - */ - - private String toJson(int level, String message, Object...args) { - return String.format("{\"level\": \"%1$s\", \"message\": \"%2$s\",\"appName\" : \"%3$s\"}", - LEVEL[level], - String.format(message, args).replace("\"", "\\\""), String.format(appName).replace("\"", "\\\"")); - } - - private String toJson(Level level, String message, Object...args) { - return String.format("{\"level\": \"%1$s\", \"message\": \"%2$s\",\"appName\" : \"%3$s\"}", - level, - String.format(message, args).replace("\"", "\\\""), String.format(appName).replace("\"", "\\\"")); - } - - /** - * Converts a {@code Throwable} into a string - * http://stackoverflow.com/a/4812589/600838 - * @param t throwable to convert - * @return string representation of the throwable - */ - private String formatThrowable(Throwable t) { - StringWriter errors = new StringWriter(); - t.printStackTrace(new PrintWriter(errors)); - return errors.toString(); - } - - /** - * Gets the JSON representation of a log event - * @param level log severity level - * @param message message to be logged - * @param args message formatting arguments - * @return JSON string - */ - private String toJson(Level level, String message, Throwable t, Object...args) { - return String.format("{\"level\": \"%1$s\", \"message\": \"%2$s\", \"exception\": \"%3$s\",\"appName\" : \"%4$s\"}", - level, - String.format(message, args).replace("\"", "\\\""), - formatThrowable(t), String.format(appName).replace("\"", "\\\"")); - } - - private String toJson(int level, String message, Throwable t, Object...args) { - return String.format("{\"level\": \"%1$s\", \"message\": \"%2$s\", \"exception\": \"%3$s\",\"appName\" : \"%4$s\"}", - LEVEL[level], - String.format(message, args).replace("\"", "\\\""), - formatThrowable(t), String.format(appName).replace("\"", "\\\"")); - - } - - - private void log(int level, String message, Object...args) { - loggly.log(toJson(level, message, args), handler); - } - - private void log(int level, String message, Throwable t, Object...args) { - loggly.log(toJson(level, message, t, args), handler); - } - - @Override - protected void log(int level, String tag, String message, Throwable t) { - // TODO Auto-generated method stub - loggly.log(toJson(level, tag, message, t), handler); - - } + private final LogglyClient loggly; + private LogglyClient.Callback handler; + private String appName; + private String[] LEVEL = { + "DEBUG", "INFO", "WARN", "ERROR" + }; + private final int DEBUG = 0, INFO = 1, WARN = 2, ERROR = 3; + + /** Log severity level */ + private enum Level { + DEBUG, + INFO, + WARN, + ERROR + } + + + /** + * Creates a Timber + * tree for posting messages to Loggly + * @param token Loggly token from https://www.loggly.com/docs/customer-token-authentication-token/ + */ + public LogglyTree(String token) { + loggly = new LogglyClient(token); + + // TODO: handle failed messages with N retries + handler = new LogglyClient.Callback() {@Override + public void success() { + + } + + @Override + public void failure(String error) { + System.err.println("LogglyTree failed: " + error); + + } + }; + } + + public LogglyTree(String token, String tag) { + loggly = new LogglyClient(token, tag); + // Setup an async callback + // TODO: handle failed messages with N retries + handler = new LogglyClient.Callback() {@Override + public void success() { + // XXX: Handle success + } + + @Override + public void failure(String error) { + System.err.println("LogglyTree failed: " + error); + } + }; + + } + + public LogglyTree(String token, String tag, String appName) { + loggly = new LogglyClient(token, tag); + this.appName = appName; + // Setup an async callback + // TODO: handle failed messages with N retries + handler = new LogglyClient.Callback() {@Override + public void success() { + // XXX: Handle success + } + + @Override + public void failure(String error) { + System.err.println("LogglyTree failed: " + error); + } + }; + } + + /** + * Logs a message with {@code DEBUG} severity + * @param message message to be logged + * @param args message formatting arguments + */@Override + public void d(String message, Object...args) { + log(DEBUG, message, args); + } + + /** + * Logs a message and an associated throwable with {@code DEBUG} severity + * @param t throwable to be logged + * @param message message to be logged + * @param args message formatting arguments + */@Override + public void d(Throwable t, String message, Object...args) { + log(DEBUG, message, t, args); + } + + /** + * Logs a message with {@code INFO} severity + * @param message message to be logged + * @param args message formatting arguments + */@Override + public void i(String message, Object...args) { + log(INFO, message, args); + } + + /** + * Logs a message and an associated throwable with {@code INFO} severity + * @param t throwable to be logged + * @param message message to be logged + * @param args message formatting arguments + */@Override + public void i(Throwable t, String message, Object...args) { + log(INFO, message, t, args); + } + + /** + * Logs a message with {@code ERROR} severity + * @param message message to be logged + * @param args message formatting arguments + */@Override + public void e(String message, Object...args) { + log(ERROR, message, args); + + } + + /** + * Logs a message and an associated throwable with {@code ERROR} severity + * @param t throwable to be logged + * @param message message to be logged + * @param args message formatting arguments + */@Override + public void e(Throwable t, String message, Object...args) { + log(ERROR, message, t, args); + } + + /** + * Logs a message with {@code WARN} severity + * @param message message to be logged + * @param args message formatting arguments + */@Override + public void w(String message, Object...args) { + log(WARN, message, args); + + } + + /** + * Logs a message and an associated throwable with {@code WARN} severity + * @param t throwable to be logged + * @param message message to be logged + * @param args message formatting arguments + */@Override + public void w(Throwable t, String message, Object...args) { + log(WARN, message, t, args); + + } + + /** + * Gets the JSON representation of a log event + * @param level log severity level + * @param message message to be logged + * @param args message formatting arguments + * @return JSON string + * + * + */ + + private String toJson(int level, String message, Object...args) { + return String.format("{\"level\": \"%1$s\", \"message\": \"%2$s\",\"appName\" : \"%3$s\"}", + LEVEL[level], + String.format(message, args).replace("\"", "\\\""), String.format(appName).replace("\"", "\\\"")); + } + + private String toJson(Level level, String message, Object...args) { + return String.format("{\"level\": \"%1$s\", \"message\": \"%2$s\",\"appName\" : \"%3$s\"}", + level, + String.format(message, args).replace("\"", "\\\""), String.format(appName).replace("\"", "\\\"")); + } + + /** + * Converts a {@code Throwable} into a string + * http://stackoverflow.com/a/4812589/600838 + * @param t throwable to convert + * @return string representation of the throwable + */ + private String formatThrowable(Throwable t) { + StringWriter errors = new StringWriter(); + t.printStackTrace(new PrintWriter(errors)); + return errors.toString(); + } + + /** + * Gets the JSON representation of a log event + * @param level log severity level + * @param message message to be logged + * @param args message formatting arguments + * @return JSON string + */ + private String toJson(Level level, String message, Throwable t, Object...args) { + return String.format("{\"level\": \"%1$s\", \"message\": \"%2$s\", \"exception\": \"%3$s\",\"appName\" : \"%4$s\"}", + level, + String.format(message, args).replace("\"", "\\\""), + formatThrowable(t), String.format(appName).replace("\"", "\\\"")); + } + + private String toJson(int level, String message, Throwable t, Object...args) { + return String.format("{\"level\": \"%1$s\", \"message\": \"%2$s\", \"exception\": \"%3$s\",\"appName\" : \"%4$s\"}", + LEVEL[level], + String.format(message, args).replace("\"", "\\\""), + formatThrowable(t), String.format(appName).replace("\"", "\\\"")); + + } + + + private void log(int level, String message, Object...args) { + loggly.log(toJson(level, message, args), handler); + } + + private void log(int level, String message, Throwable t, Object...args) { + loggly.log(toJson(level, message, t, args), handler); + } + + @Override + protected void log(int level, String tag, String message, Throwable t) { + // TODO Auto-generated method stub + loggly.log(toJson(level, tag, message, t), handler); + + } From 913181bc01a8163d6287c129ed63876cc3d58873 Mon Sep 17 00:00:00 2001 From: psquickitjayant Date: Wed, 12 Aug 2015 17:27:39 +0530 Subject: [PATCH 3/5] Restored Whitespaces --- .../tony19/timber/loggly/LogglyTree.java | 52 +++++++++++-------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/github/tony19/timber/loggly/LogglyTree.java b/src/main/java/com/github/tony19/timber/loggly/LogglyTree.java index 2457406..f2377b9 100644 --- a/src/main/java/com/github/tony19/timber/loggly/LogglyTree.java +++ b/src/main/java/com/github/tony19/timber/loggly/LogglyTree.java @@ -107,8 +107,9 @@ public void failure(String error) { * Logs a message with {@code DEBUG} severity * @param message message to be logged * @param args message formatting arguments - */@Override - public void d(String message, Object...args) { + */ + @Override + public void d(String message, Object... args) { log(DEBUG, message, args); } @@ -117,8 +118,9 @@ public void d(String message, Object...args) { * @param t throwable to be logged * @param message message to be logged * @param args message formatting arguments - */@Override - public void d(Throwable t, String message, Object...args) { + */ + @Override + public void d(Throwable t, String message, Object... args) { log(DEBUG, message, t, args); } @@ -126,8 +128,9 @@ public void d(Throwable t, String message, Object...args) { * Logs a message with {@code INFO} severity * @param message message to be logged * @param args message formatting arguments - */@Override - public void i(String message, Object...args) { + */ + @Override + public void i(String message, Object... args) { log(INFO, message, args); } @@ -136,8 +139,9 @@ public void i(String message, Object...args) { * @param t throwable to be logged * @param message message to be logged * @param args message formatting arguments - */@Override - public void i(Throwable t, String message, Object...args) { + */ + @Override + public void i(Throwable t, String message, Object... args) { log(INFO, message, t, args); } @@ -145,8 +149,9 @@ public void i(Throwable t, String message, Object...args) { * Logs a message with {@code ERROR} severity * @param message message to be logged * @param args message formatting arguments - */@Override - public void e(String message, Object...args) { + */ + @Override + public void e(String message, Object... args) { log(ERROR, message, args); } @@ -156,8 +161,9 @@ public void e(String message, Object...args) { * @param t throwable to be logged * @param message message to be logged * @param args message formatting arguments - */@Override - public void e(Throwable t, String message, Object...args) { + */ + @Override + public void e(Throwable t, String message, Object... args) { log(ERROR, message, t, args); } @@ -165,8 +171,9 @@ public void e(Throwable t, String message, Object...args) { * Logs a message with {@code WARN} severity * @param message message to be logged * @param args message formatting arguments - */@Override - public void w(String message, Object...args) { + */ + @Override + public void w(String message, Object... args) { log(WARN, message, args); } @@ -176,8 +183,9 @@ public void w(String message, Object...args) { * @param t throwable to be logged * @param message message to be logged * @param args message formatting arguments - */@Override - public void w(Throwable t, String message, Object...args) { + */ + @Override + public void w(Throwable t, String message, Object... args) { log(WARN, message, t, args); } @@ -192,13 +200,13 @@ public void w(Throwable t, String message, Object...args) { * */ - private String toJson(int level, String message, Object...args) { + private String toJson(int level, String message, Object... args) { return String.format("{\"level\": \"%1$s\", \"message\": \"%2$s\",\"appName\" : \"%3$s\"}", LEVEL[level], String.format(message, args).replace("\"", "\\\""), String.format(appName).replace("\"", "\\\"")); } - private String toJson(Level level, String message, Object...args) { + private String toJson(Level level, String message, Object... args) { return String.format("{\"level\": \"%1$s\", \"message\": \"%2$s\",\"appName\" : \"%3$s\"}", level, String.format(message, args).replace("\"", "\\\""), String.format(appName).replace("\"", "\\\"")); @@ -223,14 +231,14 @@ private String formatThrowable(Throwable t) { * @param args message formatting arguments * @return JSON string */ - private String toJson(Level level, String message, Throwable t, Object...args) { + private String toJson(Level level, String message, Throwable t, Object... args) { return String.format("{\"level\": \"%1$s\", \"message\": \"%2$s\", \"exception\": \"%3$s\",\"appName\" : \"%4$s\"}", level, String.format(message, args).replace("\"", "\\\""), formatThrowable(t), String.format(appName).replace("\"", "\\\"")); } - private String toJson(int level, String message, Throwable t, Object...args) { + private String toJson(int level, String message, Throwable t, Object... args) { return String.format("{\"level\": \"%1$s\", \"message\": \"%2$s\", \"exception\": \"%3$s\",\"appName\" : \"%4$s\"}", LEVEL[level], String.format(message, args).replace("\"", "\\\""), @@ -239,11 +247,11 @@ private String toJson(int level, String message, Throwable t, Object...args) { } - private void log(int level, String message, Object...args) { + private void log(int level, String message, Object... args) { loggly.log(toJson(level, message, args), handler); } - private void log(int level, String message, Throwable t, Object...args) { + private void log(int level, String message, Throwable t, Object... args) { loggly.log(toJson(level, message, t, args), handler); } From c646808d0d60b8685fd3f07020dc2f1c3b9e7b17 Mon Sep 17 00:00:00 2001 From: psquickitjayant Date: Wed, 12 Aug 2015 18:03:56 +0530 Subject: [PATCH 4/5] Fixed Whitespace issues --- .../tony19/timber/loggly/LogglyTree.java | 32 ++++++++++++++++--- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/github/tony19/timber/loggly/LogglyTree.java b/src/main/java/com/github/tony19/timber/loggly/LogglyTree.java index f2377b9..3ec6ae7 100644 --- a/src/main/java/com/github/tony19/timber/loggly/LogglyTree.java +++ b/src/main/java/com/github/tony19/timber/loggly/LogglyTree.java @@ -56,7 +56,8 @@ public LogglyTree(String token) { loggly = new LogglyClient(token); // TODO: handle failed messages with N retries - handler = new LogglyClient.Callback() {@Override + handler = new LogglyClient.Callback() { + @Override public void success() { } @@ -246,15 +247,36 @@ private String toJson(int level, String message, Throwable t, Object... args) { } + /** + * Asynchronously sends a log event to Loggly + * @param level log severity level + * @param message message to be logged + * @param t throwable + * @param args message formatting arguments + */ + + private void log(int level, String message, Throwable t, Object... args) { + loggly.log(toJson(level, message, t, args), handler); + } + /** + * Asynchronously sends a log event to Loggly + * @param level log severity level + * @param message message to be logged + * @param args message formatting arguments + */ + private void log(int level, String message, Object... args) { loggly.log(toJson(level, message, args), handler); } - private void log(int level, String message, Throwable t, Object... args) { - loggly.log(toJson(level, message, t, args), handler); - } - + /** + * Sets the Loggly tag for all logs going forward. This differs from + * the API of {@code Timber.TaggedTree} in that it's not a one-shot + * tag. + * @param tag desired tag or CSV of multiple tags; use empty string + * to clear tags + */ @Override protected void log(int level, String tag, String message, Throwable t) { // TODO Auto-generated method stub From 85da1ab8ad6900b5fc2e0524f75a288566cd1131 Mon Sep 17 00:00:00 2001 From: psquickitjayant Date: Wed, 12 Aug 2015 18:05:31 +0530 Subject: [PATCH 5/5] Fixed Whitespace issues --- src/main/java/com/github/tony19/timber/loggly/LogglyTree.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/github/tony19/timber/loggly/LogglyTree.java b/src/main/java/com/github/tony19/timber/loggly/LogglyTree.java index 3ec6ae7..348208a 100644 --- a/src/main/java/com/github/tony19/timber/loggly/LogglyTree.java +++ b/src/main/java/com/github/tony19/timber/loggly/LogglyTree.java @@ -209,8 +209,8 @@ private String toJson(int level, String message, Object... args) { private String toJson(Level level, String message, Object... args) { return String.format("{\"level\": \"%1$s\", \"message\": \"%2$s\",\"appName\" : \"%3$s\"}", - level, - String.format(message, args).replace("\"", "\\\""), String.format(appName).replace("\"", "\\\"")); + level, + String.format(message, args).replace("\"", "\\\""), String.format(appName).replace("\"", "\\\"")); } /**