rename dumpXxx methods that are using a logger to logXxx (align with …

…logBacktrace)
jruby · Oct 20, 2015 · 19cb58e · 19cb58e
1 parent 0baa387
commit 19cb58e
Showing 3 changed files with 41 additions and 13 deletions.
diff --git a/core/src/main/java/org/jruby/exceptions/RaiseException.java b/core/src/main/java/org/jruby/exceptions/RaiseException.java
@@ -203,7 +203,7 @@ private void preRaise(ThreadContext context, StackTraceElement[] javaTrace) {
 
         exception.prepareIntegratedBacktrace(context, javaTrace);
 
-        if (RubyInstanceConfig.LOG_EXCEPTIONS) TraceType.dumpException(exception);
+        if (RubyInstanceConfig.LOG_EXCEPTIONS) TraceType.logException(exception);
     }
 
     private void preRaise(ThreadContext context, IRubyObject backtrace) {
@@ -227,7 +227,7 @@ private void preRaise(ThreadContext context, IRubyObject backtrace) {
             setStackTrace(RaiseException.javaTraceFromRubyTrace(exception.getBacktraceElements()));
         }
 
-        if (RubyInstanceConfig.LOG_EXCEPTIONS) TraceType.dumpException(exception);
+        if (RubyInstanceConfig.LOG_EXCEPTIONS) TraceType.logException(exception);
     }
 
     private static void doCallEventHook(final ThreadContext context) {

diff --git a/core/src/main/java/org/jruby/runtime/ThreadContext.java b/core/src/main/java/org/jruby/runtime/ThreadContext.java
@@ -807,9 +807,9 @@ public IRubyObject createCallerBacktrace(int level, Integer length, StackTraceEl
             RubyString str = RubyString.newString(runtime, trace[i - level].mriStyleString());
             newTrace.append(str);
         }
-        
-        if (RubyInstanceConfig.LOG_CALLERS) TraceType.dumpCaller(newTrace);
-        
+
+        if (RubyInstanceConfig.LOG_CALLERS) TraceType.logCaller(newTrace);
+
         return newTrace;
     }
 
@@ -842,9 +842,9 @@ private RubyStackTraceElement[] getTraceSubset(int level, Integer length, StackT
         if (traceLength < 0) return null;
 
         trace = Arrays.copyOfRange(trace, level, level + traceLength);
-        
-        if (RubyInstanceConfig.LOG_CALLERS) TraceType.dumpCaller(trace);
-        
+
+        if (RubyInstanceConfig.LOG_CALLERS) TraceType.logCaller(trace);
+
         return trace;
     }
 
@@ -863,7 +863,7 @@ public RubyStackTraceElement[] createWarningBacktrace(Ruby runtime) {
 
         RubyStackTraceElement[] trace = gatherCallerBacktrace();
 
-        if (RubyInstanceConfig.LOG_WARNINGS) TraceType.dumpWarning(trace);
+        if (RubyInstanceConfig.LOG_WARNINGS) TraceType.logWarning(trace);
 
         return trace;
     }

diff --git a/core/src/main/java/org/jruby/runtime/backtrace/TraceType.java b/core/src/main/java/org/jruby/runtime/backtrace/TraceType.java
@@ -73,25 +73,53 @@ public static void logBacktrace(RubyStackTraceElement[] trace) {
         LOG.info("Backtrace generated:\n{}", buffer);
     }
 
-    public static void dumpException(RubyException exception) {
+    public static void logException(RubyException exception) {
         LOG.info("Exception raised: {} : {}", exception.getMetaClass(), exception);
     }
 
+    /**
+     * @deprecated use {@link #logException(org.jruby.RubyException)}
+     */
+    public static void dumpException(RubyException exception) {
+        logException(exception);
+    }
+
     public static void dumpBacktrace(RubyException exception) {
         Ruby runtime = exception.getRuntime();
         System.err.println("Backtrace generated:\n" + printBacktraceJRuby(exception, runtime.getPosix().isatty(FileDescriptor.err)));
     }
 
+    public static void logCaller(RubyArray trace) {
+        LOG.info("Caller backtrace generated:\n{}", trace);
+    }
+
+    /**
+     * @deprecated use {@link #logCaller(org.jruby.RubyArray)}
+     */
     public static void dumpCaller(RubyArray trace) {
-        LOG.info("Caller backtrace generated:\n" + trace);
+        logCaller(trace);
+    }
+
+    public static void logCaller(RubyStackTraceElement[] trace) {
+        LOG.info("Caller backtrace generated:\n{}", Arrays.toString(trace));
     }
 
+    /**
+     * @deprecated use {@link #logCaller(org.jruby.runtime.backtrace.RubyStackTraceElement[]) }
+     */
     public static void dumpCaller(RubyStackTraceElement[] trace) {
-        LOG.info("Caller backtrace generated:\n" + Arrays.toString(trace));
+        logCaller(trace);
     }
 
+    public static void logWarning(RubyStackTraceElement[] trace) {
+        LOG.info("Warning backtrace generated:\n{}", Arrays.toString(trace));
+    }
+
+    /**
+     * @deprecated use {@link #logWarning(org.jruby.runtime.backtrace.RubyStackTraceElement[])
+     */
     public static void dumpWarning(RubyStackTraceElement[] trace) {
-        LOG.info("Warning backtrace generated:\n" + Arrays.toString(trace));
+        logWarning(trace);
     }
 
     public static TraceType traceTypeFor(String style) {