diff --git a/app/src/main/assets/logback.xml b/app/src/main/assets/logback.xml
index ae1594f639..5329eb18d0 100644
--- a/app/src/main/assets/logback.xml
+++ b/app/src/main/assets/logback.xml
@@ -18,7 +18,7 @@
120
- %d{HH:mm:ss.SSS} [%thread] %.-1level/%logger: [%class{0}.%M\(\):%line]: %msg%n
+ %d{HH:mm:ss.SSS} [%thread] %.-1level/%logger: %msg%n
@@ -27,7 +27,7 @@
%logger{0}
- [%thread] [%class{0}.%M\(\):%line]: %msg%n
+ [%thread]: %msg%n
diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java
index 788fbc3fc2..c3a5eb0ab6 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@@ -41,6 +41,7 @@ import info.nightscout.androidaps.interfaces.PluginType;
import info.nightscout.androidaps.logging.AAPSLogger;
import info.nightscout.androidaps.logging.L;
import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin;
import info.nightscout.androidaps.plugins.aps.openAPSMA.OpenAPSMAPlugin;
@@ -109,7 +110,7 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper;
import io.fabric.sdk.android.Fabric;
public class MainApp extends DaggerApplication {
- static Logger log = LoggerFactory.getLogger(L.CORE);
+ static Logger log = StacktraceLoggerWrapper.getLogger(L.CORE);
static MainApp sInstance;
private static Resources sResources;
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java b/app/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java
index 9ea091cda5..94c7228352 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java
@@ -39,6 +39,7 @@ import info.nightscout.androidaps.db.TDD;
import info.nightscout.androidaps.events.EventPumpStatusChanged;
import info.nightscout.androidaps.interfaces.ActivePluginProvider;
import info.nightscout.androidaps.interfaces.CommandQueueProvider;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
@@ -70,7 +71,7 @@ public class TDDStatsActivity extends NoSplashAppCompatActivity {
@Inject ConfigBuilderPlugin configBuilderPlugin;
@Inject CommandQueueProvider commandQueue;
- private static Logger log = LoggerFactory.getLogger(TDDStatsActivity.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(TDDStatsActivity.class);
private CompositeDisposable disposable = new CompositeDisposable();
TextView statusView, statsMessage, totalBaseBasal2;
diff --git a/app/src/main/java/info/nightscout/androidaps/data/IobTotal.java b/app/src/main/java/info/nightscout/androidaps/data/IobTotal.java
index 60e1b21048..7538cfa9ad 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/IobTotal.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/IobTotal.java
@@ -7,13 +7,14 @@ import org.slf4j.LoggerFactory;
import java.util.Date;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface;
import info.nightscout.androidaps.plugins.general.overview.graphExtensions.PointsWithLabelGraphSeries;
import info.nightscout.androidaps.utils.DateUtil;
import info.nightscout.androidaps.utils.Round;
public class IobTotal implements DataPointWithLabelInterface {
- private static Logger log = LoggerFactory.getLogger(IobTotal.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(IobTotal.class);
public double iob;
public double activity;
diff --git a/app/src/main/java/info/nightscout/androidaps/data/Profile.java b/app/src/main/java/info/nightscout/androidaps/data/Profile.java
index 8df6d81acd..2e116c4a0e 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/Profile.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/Profile.java
@@ -17,6 +17,7 @@ import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.interfaces.PumpDescription;
import info.nightscout.androidaps.interfaces.PumpInterface;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
@@ -28,7 +29,7 @@ import info.nightscout.androidaps.utils.FabricPrivacy;
import info.nightscout.androidaps.utils.MidnightTime;
public class Profile {
- private static Logger log = LoggerFactory.getLogger(Profile.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(Profile.class);
private JSONObject json;
private String units;
diff --git a/app/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java b/app/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java
index 37be1dc6e9..c93c549afc 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java
@@ -10,6 +10,7 @@ import java.util.ArrayList;
import java.util.List;
import info.nightscout.androidaps.interfaces.Interval;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
/**
* Created by mike on 09.05.2017.
@@ -19,7 +20,7 @@ import info.nightscout.androidaps.interfaces.Interval;
// When no interval match the lastest record without duration is used
public class ProfileIntervals {
- private static Logger log = LoggerFactory.getLogger(ProfileIntervals.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(ProfileIntervals.class);
private LongSparseArray rawData; // oldest at index 0
diff --git a/app/src/main/java/info/nightscout/androidaps/data/ProfileStore.kt b/app/src/main/java/info/nightscout/androidaps/data/ProfileStore.kt
index 9415a25f2c..e537e8c971 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/ProfileStore.kt
+++ b/app/src/main/java/info/nightscout/androidaps/data/ProfileStore.kt
@@ -1,6 +1,7 @@
package info.nightscout.androidaps.data
import androidx.collection.ArrayMap
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper
import info.nightscout.androidaps.utils.JsonHelper
import org.json.JSONException
import org.json.JSONObject
@@ -8,7 +9,7 @@ import org.slf4j.LoggerFactory
import java.util.*
class ProfileStore(val data: JSONObject) {
- private val log = LoggerFactory.getLogger(ProfileStore::class.java)
+ private val log = StacktraceLoggerWrapper.getLogger(ProfileStore::class.java)
private val cachedObjects = ArrayMap()
diff --git a/app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java b/app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
index b7811b6eaa..8563bfbe17 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
@@ -8,11 +8,12 @@ import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.utils.DecimalFormatter;
import info.nightscout.androidaps.utils.Round;
public class PumpEnactResult {
- private static Logger log = LoggerFactory.getLogger(L.APS);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.APS);
public boolean success = false; // request was processed successfully (but possible no change was needed)
public boolean enacted = false; // request was processed successfully and change has been made
diff --git a/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java b/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
index 01a297f75e..b7c8091dcd 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
@@ -25,6 +25,7 @@ import info.nightscout.androidaps.R;
import info.nightscout.androidaps.data.Profile;
import info.nightscout.androidaps.interfaces.Interval;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
import info.nightscout.androidaps.plugins.general.nsclient.data.NSMbg;
import info.nightscout.androidaps.plugins.general.overview.OverviewFragment;
@@ -36,7 +37,7 @@ import info.nightscout.androidaps.utils.Translator;
@DatabaseTable(tableName = DatabaseHelper.DATABASE_CAREPORTALEVENTS)
public class CareportalEvent implements DataPointWithLabelInterface, Interval {
- private static Logger log = LoggerFactory.getLogger(L.DATABASE);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.DATABASE);
@DatabaseField(id = true)
public long date;
diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
index 3f491432e9..592cb6416e 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
@@ -47,6 +47,7 @@ import info.nightscout.androidaps.events.EventTempBasalChange;
import info.nightscout.androidaps.events.EventTempTargetChange;
import info.nightscout.androidaps.interfaces.ProfileInterface;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
@@ -70,7 +71,7 @@ import info.nightscout.androidaps.utils.ToastUtils;
* direct calls to the corresponding methods (eg. resetDatabases) should be done by a central service.
*/
public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
- private static Logger log = LoggerFactory.getLogger(L.DATABASE);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.DATABASE);
public static final String DATABASE_NAME = "AndroidAPSDb";
public static final String DATABASE_BGREADINGS = "BgReadings";
diff --git a/app/src/main/java/info/nightscout/androidaps/db/DbRequest.java b/app/src/main/java/info/nightscout/androidaps/db/DbRequest.java
index bec190a353..a7bb67cb64 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DbRequest.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DbRequest.java
@@ -11,6 +11,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.utils.DateUtil;
/**
@@ -20,7 +21,7 @@ import info.nightscout.androidaps.utils.DateUtil;
*/
@DatabaseTable(tableName = DatabaseHelper.DATABASE_DBREQUESTS)
public class DbRequest {
- private static Logger log = LoggerFactory.getLogger(L.DATABASE);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.DATABASE);
@DatabaseField(id = true)
public String nsClientID = null;
diff --git a/app/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java b/app/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
index 1632751d55..ffba0c4c27 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
@@ -22,6 +22,7 @@ import info.nightscout.androidaps.data.Profile;
import info.nightscout.androidaps.interfaces.InsulinInterface;
import info.nightscout.androidaps.interfaces.Interval;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface;
import info.nightscout.androidaps.plugins.general.overview.graphExtensions.PointsWithLabelGraphSeries;
@@ -38,7 +39,7 @@ import info.nightscout.androidaps.utils.Round;
@DatabaseTable(tableName = DatabaseHelper.DATABASE_EXTENDEDBOLUSES)
public class ExtendedBolus implements Interval, DataPointWithLabelInterface {
- private static Logger log = LoggerFactory.getLogger(L.DATABASE);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.DATABASE);
@DatabaseField(id = true)
public long date;
diff --git a/app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java b/app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java
index 130cb015b1..8a3c0c0b9c 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java
@@ -20,6 +20,7 @@ import info.nightscout.androidaps.R;
import info.nightscout.androidaps.data.Profile;
import info.nightscout.androidaps.interfaces.Interval;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface;
@@ -33,7 +34,7 @@ import info.nightscout.androidaps.utils.T;
@DatabaseTable(tableName = DatabaseHelper.DATABASE_PROFILESWITCHES)
public class ProfileSwitch implements Interval, DataPointWithLabelInterface {
- private static Logger log = LoggerFactory.getLogger(L.DATABASE);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.DATABASE);
@DatabaseField(id = true)
public long date;
diff --git a/app/src/main/java/info/nightscout/androidaps/db/TDD.java b/app/src/main/java/info/nightscout/androidaps/db/TDD.java
index be81e36ba3..3b4727a100 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/TDD.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/TDD.java
@@ -9,6 +9,7 @@ import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
import info.nightscout.androidaps.utils.DateUtil;
@@ -19,7 +20,7 @@ import info.nightscout.androidaps.utils.DateUtil;
@DatabaseTable(tableName = DatabaseHelper.DATABASE_TDDS)
public class TDD {
- private static Logger log = LoggerFactory.getLogger(L.DATABASE);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.DATABASE);
@DatabaseField(id = true)
public long date;
diff --git a/app/src/main/java/info/nightscout/androidaps/db/TempTarget.java b/app/src/main/java/info/nightscout/androidaps/db/TempTarget.java
index ef60d02911..9966425260 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/TempTarget.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/TempTarget.java
@@ -14,12 +14,13 @@ import info.nightscout.androidaps.R;
import info.nightscout.androidaps.data.Profile;
import info.nightscout.androidaps.interfaces.Interval;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.utils.DateUtil;
import info.nightscout.androidaps.utils.DecimalFormatter;
@DatabaseTable(tableName = DatabaseHelper.DATABASE_TEMPTARGETS)
public class TempTarget implements Interval {
- private static Logger log = LoggerFactory.getLogger(L.DATABASE);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.DATABASE);
@DatabaseField(id = true)
public long date;
diff --git a/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java b/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
index cf0eeab462..6982b729ed 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
@@ -15,6 +15,7 @@ import info.nightscout.androidaps.data.Profile;
import info.nightscout.androidaps.interfaces.InsulinInterface;
import info.nightscout.androidaps.interfaces.Interval;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
@@ -29,7 +30,7 @@ import info.nightscout.androidaps.utils.SP;
@DatabaseTable(tableName = DatabaseHelper.DATABASE_TEMPORARYBASALS)
public class TemporaryBasal implements Interval, DbObjectBase {
- private static Logger log = LoggerFactory.getLogger(L.DATABASE);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.DATABASE);
@DatabaseField(id = true)
public long date;
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/Constraint.java b/app/src/main/java/info/nightscout/androidaps/interfaces/Constraint.java
index 417f02199d..7f154e9804 100644
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/Constraint.java
+++ b/app/src/main/java/info/nightscout/androidaps/interfaces/Constraint.java
@@ -7,13 +7,14 @@ import java.util.ArrayList;
import java.util.List;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
/**
* Created by mike on 19.03.2018.
*/
public class Constraint {
- private static Logger log = LoggerFactory.getLogger(L.CONSTRAINTS);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.CONSTRAINTS);
T value;
T originalValue;
diff --git a/app/src/main/java/info/nightscout/androidaps/logging/AAPSLoggerProduction.kt b/app/src/main/java/info/nightscout/androidaps/logging/AAPSLoggerProduction.kt
index 65425c4e35..dde036ef2d 100644
--- a/app/src/main/java/info/nightscout/androidaps/logging/AAPSLoggerProduction.kt
+++ b/app/src/main/java/info/nightscout/androidaps/logging/AAPSLoggerProduction.kt
@@ -9,51 +9,56 @@ import org.slf4j.LoggerFactory
class AAPSLoggerProduction : AAPSLogger {
override fun debug(message: String) {
- LoggerFactory.getLogger(LTag.CORE.tag).debug(message)
+ LoggerFactory.getLogger(LTag.CORE.tag).debug(stackLogMarker() + message)
}
override fun debug(enable: Boolean, tag: LTag, message: String) {
if (enable && L.isEnabled(tag.tag)) {
- LoggerFactory.getLogger(tag.tag).debug(message)
+ LoggerFactory.getLogger(tag.tag).debug(stackLogMarker() + message)
}
}
override fun debug(tag: LTag, message: String) {
if (L.isEnabled(tag.tag)) {
- LoggerFactory.getLogger(tag.tag).debug(message)
+ LoggerFactory.getLogger(tag.tag).debug(stackLogMarker() + message)
}
}
override fun warn(tag: LTag, message: String) {
if (L.isEnabled(tag.tag)) {
- LoggerFactory.getLogger(tag.tag).warn(message)
+ LoggerFactory.getLogger(tag.tag).warn(stackLogMarker() + message)
}
}
override fun info(tag: LTag, message: String) {
if (L.isEnabled(tag.tag)) {
- LoggerFactory.getLogger(tag.tag).info(message)
+ LoggerFactory.getLogger(tag.tag).info(stackLogMarker() + message)
}
}
override fun error(tag: LTag, message: String) {
if (L.isEnabled(tag.tag)) {
- LoggerFactory.getLogger(tag.tag).error(message)
+ LoggerFactory.getLogger(tag.tag).error(stackLogMarker() + message)
}
}
override fun error(message: String) {
- LoggerFactory.getLogger(LTag.CORE.tag).error(message)
+ LoggerFactory.getLogger(LTag.CORE.tag).error(stackLogMarker() + message)
}
override fun error(message: String, throwable: Throwable) {
- LoggerFactory.getLogger(LTag.CORE.tag).error(message, throwable)
+ LoggerFactory.getLogger(LTag.CORE.tag).error(stackLogMarker() + message, throwable)
}
override fun error(tag: LTag, message: String, throwable: Throwable) {
if (L.isEnabled(tag.tag)) {
- LoggerFactory.getLogger(tag.tag).error(message, throwable)
+ LoggerFactory.getLogger(tag.tag).error(stackLogMarker() + message, throwable)
}
}
-}
\ No newline at end of file
+}
+
+fun StackTraceElement.toLogString(): String = "[${this.className.substringAfterLast(".")}.${this.methodName}():${this.lineNumber}]: "
+
+/* Needs to be inline. Don't remove even if IDE suggests it. */
+inline fun stackLogMarker() = Throwable().stackTrace[1].toLogString()
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/logging/StacktraceLoggerWrapper.kt b/app/src/main/java/info/nightscout/androidaps/logging/StacktraceLoggerWrapper.kt
new file mode 100644
index 0000000000..0d724a5008
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/logging/StacktraceLoggerWrapper.kt
@@ -0,0 +1,43 @@
+package info.nightscout.androidaps.logging
+
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+
+/**
+ * Created by adrian on 2020-01-13.
+ */
+
+class StacktraceLoggerWrapper(private val delegate: Logger) : Logger by delegate {
+
+ override fun debug(msg: String?) {
+ delegate.debug(stackLogMarker() + msg)
+ }
+
+ override fun debug(format: String?, arg: Any?) {
+ delegate.debug(stackLogMarker() + format, arg)
+ }
+
+ override fun info(msg: String?) {
+ delegate.info(stackLogMarker() + msg)
+ }
+
+ override fun error(msg: String?) {
+ delegate.error(stackLogMarker() + msg)
+ }
+
+ override fun warn(msg: String?) {
+ delegate.warn(stackLogMarker() + msg)
+ }
+
+ // all other methods will be implemented by delegate
+
+ companion object {
+ @JvmStatic
+ @Deprecated("please inject AAPSLogger")
+ fun getLogger(name: String) = StacktraceLoggerWrapper(LoggerFactory.getLogger(name))
+
+ @JvmStatic
+ @Deprecated("please inject AAPSLogger")
+ fun getLogger(clazz: Class<*>) = StacktraceLoggerWrapper(LoggerFactory.getLogger(clazz))
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java
index 9f2142771a..7d091efbdc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java
@@ -22,6 +22,7 @@ import info.nightscout.androidaps.interfaces.Constraint;
import info.nightscout.androidaps.interfaces.PumpDescription;
import info.nightscout.androidaps.interfaces.PumpInterface;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
@@ -33,7 +34,7 @@ import info.nightscout.androidaps.utils.SP;
* Created by mike on 09.06.2016.
*/
public class APSResult {
- private static Logger log = LoggerFactory.getLogger(L.APS);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.APS);
public long date = 0;
public String reason;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/DeviceStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/DeviceStatus.java
index 26d7359efe..5222926a9e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/DeviceStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/DeviceStatus.java
@@ -6,6 +6,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
/*
{
@@ -365,7 +366,7 @@ import info.nightscout.androidaps.logging.L;
*/
public class DeviceStatus {
- private static Logger log = LoggerFactory.getLogger(L.APS);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.APS);
public String device = null;
public JSONObject pump = null;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctions.java b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctions.java
index c7fd31c795..0d5eea5b2b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctions.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctions.java
@@ -25,6 +25,7 @@ import info.nightscout.androidaps.events.EventProfileNeedsUpdate;
import info.nightscout.androidaps.interfaces.ProfileInterface;
import info.nightscout.androidaps.interfaces.TreatmentsInterface;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
import info.nightscout.androidaps.queue.Callback;
@@ -35,7 +36,7 @@ import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.schedulers.Schedulers;
public class ProfileFunctions implements ProfileFunction {
- private static Logger log = LoggerFactory.getLogger(L.PROFILE);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PROFILE);
private CompositeDisposable disposable = new CompositeDisposable();
private static ProfileFunctions profileFunctions = null;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt
index 2e5db61e97..005ab8f086 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt
@@ -10,6 +10,7 @@ import info.nightscout.androidaps.interfaces.PluginDescription
import info.nightscout.androidaps.interfaces.PluginType
import info.nightscout.androidaps.logging.AAPSLogger
import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper
import info.nightscout.androidaps.plugins.bus.RxBusWrapper
import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
@@ -51,7 +52,7 @@ class SignatureVerifierPlugin @Inject constructor(
private val REVOKED_CERTS_URL = "https://raw.githubusercontent.com/MilosKozak/AndroidAPS/master/app/src/main/assets/revoked_certs.txt"
private val UPDATE_INTERVAL = TimeUnit.DAYS.toMillis(1)
- private val log = LoggerFactory.getLogger(L.CORE)
+ private val log = StacktraceLoggerWrapper.getLogger(L.CORE)
private val lock: Any = arrayOfNulls(0)
private var revokedCertsFile: File? = null
private var revokedCerts: List? = null
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java
index 7564696b15..31cfb8a800 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java
@@ -49,6 +49,7 @@ import info.nightscout.androidaps.data.ProfileStore;
import info.nightscout.androidaps.db.BgReading;
import info.nightscout.androidaps.db.CareportalEvent;
import info.nightscout.androidaps.db.ProfileSwitch;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
@@ -76,7 +77,7 @@ public class NewNSTreatmentDialog extends DaggerDialogFragment implements View.O
@Inject ConfigBuilderPlugin configBuilderPlugin;
@Inject TreatmentsPlugin treatmentsPlugin;
- private static Logger log = LoggerFactory.getLogger(NewNSTreatmentDialog.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(NewNSTreatmentDialog.class);
private static OptionsToShow options;
private static @StringRes int event;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodService.java
index 56f282e88a..19ceb73ca6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodService.java
@@ -32,6 +32,7 @@ import info.nightscout.androidaps.events.Event;
import info.nightscout.androidaps.events.EventFoodDatabaseChanged;
import info.nightscout.androidaps.events.EventNsFood;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.utils.FabricPrivacy;
import io.reactivex.disposables.CompositeDisposable;
@@ -42,7 +43,7 @@ import io.reactivex.schedulers.Schedulers;
*/
public class FoodService extends OrmLiteBaseService {
- private Logger log = LoggerFactory.getLogger(L.DATAFOOD);
+ private Logger log = StacktraceLoggerWrapper.getLogger(L.DATAFOOD);
private CompositeDisposable disposable = new CompositeDisposable();
private static final ScheduledExecutorService foodEventWorker = Executors.newSingleThreadScheduledExecutor();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.java
index 7c5981f746..59c8e87144 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.java
@@ -27,6 +27,7 @@ import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.events.EventAppExit;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.utils.OKDialog;
import info.nightscout.androidaps.utils.SP;
@@ -37,7 +38,7 @@ import info.nightscout.androidaps.utils.ToastUtils;
*/
public class ImportExportPrefs {
- private static Logger log = LoggerFactory.getLogger(L.CORE);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.CORE);
private static File path = new File(Environment.getExternalStorageDirectory().toString());
static public final File file = new File(path, MainApp.gs(R.string.app_name) + "Preferences");
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/LoggerUtils.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/LoggerUtils.java
index 29eeabdf5f..9205dc0ccd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/LoggerUtils.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/LoggerUtils.java
@@ -5,13 +5,14 @@ import org.slf4j.LoggerFactory;
import ch.qos.logback.classic.LoggerContext;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
/**
* This class provides serveral methods for log-handling (eg. sending logs as emails).
*/
public class LoggerUtils {
- private static final Logger LOGGER = LoggerFactory.getLogger(L.CORE);
+ private static final Logger LOGGER = StacktraceLoggerWrapper.getLogger(L.CORE);
public static String SUFFIX = ".log.zip";
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
index f3f799ddb1..804ea823e6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
@@ -36,6 +36,7 @@ import info.nightscout.androidaps.interfaces.PluginDescription;
import info.nightscout.androidaps.interfaces.PluginType;
import info.nightscout.androidaps.logging.AAPSLogger;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
import info.nightscout.androidaps.plugins.general.nsclient.data.AlarmAck;
import info.nightscout.androidaps.plugins.general.nsclient.data.NSAlarm;
@@ -53,7 +54,7 @@ import io.reactivex.schedulers.Schedulers;
@Singleton
public class NSClientPlugin extends PluginBase {
- private Logger log = LoggerFactory.getLogger(L.NSCLIENT);
+ private Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
private CompositeDisposable disposable = new CompositeDisposable();
private final AAPSLogger aapsLogger;
@@ -72,7 +73,7 @@ public class NSClientPlugin extends PluginBase {
public NSClientService nsClientService = null;
- private NsClientReceiverDelegate nsClientReceiverDelegate;
+ private NsClientReceiverDelegate nsClientReceiverDelegate = new NsClientReceiverDelegate();
@Inject
public NSClientPlugin(
@@ -114,7 +115,6 @@ public class NSClientPlugin extends PluginBase {
protected void onStart() {
paused = SP.getBoolean(R.string.key_nsclientinternal_paused, false);
autoscroll = SP.getBoolean(R.string.key_nsclientinternal_autoscroll, true);
- nsClientReceiverDelegate = new NsClientReceiverDelegate();
Context context = MainApp.instance().getApplicationContext();
Intent intent = new Intent(context, NSClientService.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
index 3e2e575835..0dd50366e3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
@@ -37,6 +37,7 @@ import info.nightscout.androidaps.db.ProfileSwitch;
import info.nightscout.androidaps.db.TempTarget;
import info.nightscout.androidaps.db.TemporaryBasal;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.aps.loop.APSResult;
import info.nightscout.androidaps.plugins.aps.loop.DeviceStatus;
import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
@@ -51,7 +52,7 @@ import info.nightscout.androidaps.utils.SP;
* Created by mike on 26.05.2017.
*/
public class NSUpload {
- private static Logger log = LoggerFactory.getLogger(L.NSCLIENT);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
public static void uploadTempBasalStartAbsolute(TemporaryBasal temporaryBasal, Double originalExtendedAmount) {
try {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/UploadQueue.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/UploadQueue.java
index f2ff8bd196..8c48cfa41a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/UploadQueue.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/UploadQueue.java
@@ -17,6 +17,7 @@ import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.db.DatabaseHelper;
import info.nightscout.androidaps.db.DbRequest;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientResend;
import info.nightscout.androidaps.plugins.general.nsclient.services.NSClientService;
@@ -25,7 +26,7 @@ import info.nightscout.androidaps.plugins.general.nsclient.services.NSClientServ
* Created by mike on 21.02.2016.
*/
public class UploadQueue {
- private static Logger log = LoggerFactory.getLogger(L.NSCLIENT);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
public static String status() {
return "QUEUE: " + MainApp.getDbHelper().size(DatabaseHelper.DATABASE_DBREQUESTS);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAddAck.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAddAck.java
index 1457ba4daa..cd1b525d59 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAddAck.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAddAck.java
@@ -7,6 +7,7 @@ import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.events.Event;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart;
import io.socket.client.Ack;
@@ -15,7 +16,7 @@ import io.socket.client.Ack;
* Created by mike on 29.12.2015.
*/
public class NSAddAck extends Event implements Ack {
- private static Logger log = LoggerFactory.getLogger(L.NSCLIENT);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
public String _id = null;
public String nsClientID = null;
public JSONObject json = null;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSUpdateAck.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSUpdateAck.java
index ac6f85dd3a..805a1495a8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSUpdateAck.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSUpdateAck.java
@@ -7,6 +7,7 @@ import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.events.Event;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import io.socket.client.Ack;
@@ -14,7 +15,7 @@ import io.socket.client.Ack;
* Created by mike on 21.02.2016.
*/
public class NSUpdateAck extends Event implements Ack {
- private static Logger log = LoggerFactory.getLogger(L.NSCLIENT);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
public boolean result = false;
public String _id;
public String action;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSMbg.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSMbg.java
index 9e3475c27e..537a08e363 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSMbg.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSMbg.java
@@ -6,9 +6,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
public class NSMbg {
- private static Logger log = LoggerFactory.getLogger(L.NSCLIENT);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
public long date;
public double mbg;
public String json;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSgv.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSgv.java
index 391b363d99..ac6225813e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSgv.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSgv.java
@@ -6,13 +6,14 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
/**
*
* {"mgdl":105,"mills":1455136282375,"device":"xDrip-BluetoothWixel","direction":"Flat","filtered":98272,"unfiltered":98272,"noise":1,"rssi":100}
*/
public class NSSgv {
- private static Logger log = LoggerFactory.getLogger(L.NSCLIENT);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
private JSONObject data;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSTreatment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSTreatment.java
index 39491445a0..1c31922949 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSTreatment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSTreatment.java
@@ -8,9 +8,10 @@ import org.slf4j.LoggerFactory;
import java.util.Date;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
public class NSTreatment {
- private static Logger log = LoggerFactory.getLogger(L.NSCLIENT);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
private JSONObject data;
private String action = null; // "update", "remove" or null (add)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
index c9659cfcbc..332755d6af 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
@@ -43,6 +43,7 @@ import info.nightscout.androidaps.interfaces.PluginType;
import info.nightscout.androidaps.logging.AAPSLogger;
import info.nightscout.androidaps.logging.L;
import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin;
import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue;
@@ -86,7 +87,7 @@ public class NSClientService extends DaggerService {
@Inject SP sp;
@Inject NSClientPlugin nsClientPlugin;
- private static Logger log = LoggerFactory.getLogger(L.NSCLIENT);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
private CompositeDisposable disposable = new CompositeDisposable();
static public PowerManager.WakeLock mWakeLock;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.java
index 74f4c4a6d0..c54692f20b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.java
@@ -29,6 +29,7 @@ import info.nightscout.androidaps.db.ExtendedBolus;
import info.nightscout.androidaps.db.ProfileSwitch;
import info.nightscout.androidaps.db.TempTarget;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.aps.loop.APSResult;
import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
import info.nightscout.androidaps.plugins.aps.openAPSSMB.SMBDefaults;
@@ -57,7 +58,7 @@ import info.nightscout.androidaps.utils.SP;
*/
public class GraphData {
- private static Logger log = LoggerFactory.getLogger(L.OVERVIEW);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.OVERVIEW);
private GraphView graph;
public double maxY = Double.MIN_VALUE;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequest.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequest.kt
index 58b5d0a440..128652e714 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequest.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequest.kt
@@ -3,12 +3,13 @@ package info.nightscout.androidaps.plugins.general.smsCommunicator
import info.nightscout.androidaps.Constants
import info.nightscout.androidaps.R
import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper
import info.nightscout.androidaps.utils.DateUtil
import info.nightscout.androidaps.utils.resources.ResourceHelper
import org.slf4j.LoggerFactory
class AuthRequest internal constructor(val plugin: SmsCommunicatorPlugin, val resourceHelper: ResourceHelper, var requester: Sms, requestText: String, var confirmCode: String, val action: SmsAction) {
- private val log = LoggerFactory.getLogger(L.SMS)
+ private val log = StacktraceLoggerWrapper.getLogger(L.SMS)
private val date = DateUtil.now()
private var processed = false
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/InfoInterceptor.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/InfoInterceptor.kt
index 4acc0b5d67..c1a9f55dc6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/InfoInterceptor.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/InfoInterceptor.kt
@@ -1,6 +1,7 @@
package info.nightscout.androidaps.plugins.general.tidepool.comm
import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper
import okhttp3.Interceptor
import okhttp3.Response
import okio.Buffer
@@ -9,7 +10,7 @@ import java.io.IOException
class InfoInterceptor(tag: String) : Interceptor {
- private val log = LoggerFactory.getLogger(L.TIDEPOOL)
+ private val log = StacktraceLoggerWrapper.getLogger(L.TIDEPOOL)
private var tag = "interceptor"
init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolCallback.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolCallback.kt
index 7998553eaa..010d4f74a6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolCallback.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolCallback.kt
@@ -1,6 +1,7 @@
package info.nightscout.androidaps.plugins.general.tidepool.comm
import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper
import info.nightscout.androidaps.plugins.bus.RxBusWrapper
import info.nightscout.androidaps.plugins.general.tidepool.events.EventTidepoolStatus
import org.slf4j.LoggerFactory
@@ -9,7 +10,7 @@ import retrofit2.Callback
import retrofit2.Response
internal class TidepoolCallback(private val rxBus: RxBusWrapper, private val session: Session, val name: String, val onSuccess: () -> Unit, val onFail: () -> Unit) : Callback {
- private val log = LoggerFactory.getLogger(L.TIDEPOOL)
+ private val log = StacktraceLoggerWrapper.getLogger(L.TIDEPOOL)
override fun onResponse(call: Call, response: Response) {
if (response.isSuccessful && response.body() != null) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/UploadChunk.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/UploadChunk.kt
index 919e15941e..f9b83909d7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/UploadChunk.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/UploadChunk.kt
@@ -8,6 +8,7 @@ import info.nightscout.androidaps.db.TemporaryBasal
import info.nightscout.androidaps.logging.AAPSLogger
import info.nightscout.androidaps.logging.L
import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper
import info.nightscout.androidaps.plugins.bus.RxBusWrapper
import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
@@ -37,7 +38,7 @@ class UploadChunk @Inject constructor(
private val MAX_UPLOAD_SIZE = T.days(7).msecs() // don't change this
- private val log = LoggerFactory.getLogger(L.TIDEPOOL)
+ private val log = StacktraceLoggerWrapper.getLogger(L.TIDEPOOL)
fun getNext(session: Session?): String? {
if (session == null)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/events/EventTidepoolStatus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/events/EventTidepoolStatus.kt
index f9e2b724cb..bbb86c45b8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/events/EventTidepoolStatus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/events/EventTidepoolStatus.kt
@@ -2,13 +2,14 @@ package info.nightscout.androidaps.plugins.general.tidepool.events
import info.nightscout.androidaps.events.Event
import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper
import info.nightscout.androidaps.utils.DateUtil
import org.slf4j.LoggerFactory
import java.text.SimpleDateFormat
import java.util.*
class EventTidepoolStatus(val status: String) : Event() {
- private val log = LoggerFactory.getLogger(L.TIDEPOOL)
+ private val log = StacktraceLoggerWrapper.getLogger(L.TIDEPOOL)
var date: Long = DateUtil.now()
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/utils/RateLimit.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/utils/RateLimit.kt
index 88f09abdc2..6f23a3f9c1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/utils/RateLimit.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/utils/RateLimit.kt
@@ -1,6 +1,7 @@
package info.nightscout.androidaps.plugins.general.tidepool.utils
import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper
import info.nightscout.androidaps.utils.DateUtil
import info.nightscout.androidaps.utils.T
import org.slf4j.LoggerFactory
@@ -10,7 +11,7 @@ object RateLimit {
private val rateLimits = HashMap()
- private val log = LoggerFactory.getLogger(L.TIDEPOOL)
+ private val log = StacktraceLoggerWrapper.getLogger(L.TIDEPOOL)
// return true if below rate limit
@Synchronized
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensData.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensData.java
index eee999ff4f..d3d11d1d48 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensData.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensData.java
@@ -14,6 +14,7 @@ import info.nightscout.androidaps.Constants;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.data.Profile;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.aps.openAPSSMB.SMBDefaults;
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface;
@@ -27,7 +28,7 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper;
import info.nightscout.androidaps.utils.sharedPreferences.SP;
public class AutosensData implements DataPointWithLabelInterface {
- private static Logger log = LoggerFactory.getLogger(L.AUTOSENS);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.AUTOSENS);
@Inject SP sp;
@Inject ResourceHelper resourceHelper;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensResult.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensResult.java
index 082ebc057d..3f478cc478 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensResult.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensResult.java
@@ -6,12 +6,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
/**
* Created by mike on 06.01.2017.
*/
public class AutosensResult {
- private static Logger log = LoggerFactory.getLogger(L.AUTOSENS);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.AUTOSENS);
//default values to show when autosens algorithm is not called
public double ratio = 1d;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatus.java
index 159c5865af..334156230e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatus.java
@@ -10,6 +10,7 @@ import java.util.List;
import info.nightscout.androidaps.db.BgReading;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.utils.DateUtil;
import info.nightscout.androidaps.utils.DecimalFormatter;
import info.nightscout.androidaps.utils.Round;
@@ -19,7 +20,7 @@ import info.nightscout.androidaps.utils.Round;
*/
public class GlucoseStatus {
- private static Logger log = LoggerFactory.getLogger(GlucoseStatus.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(GlucoseStatus.class);
public double glucose = 0d;
public double delta = 0d;
public double avgdelta = 0d;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
index d7fdc2fc6a..ea99ed273a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
@@ -42,6 +42,7 @@ import info.nightscout.androidaps.interfaces.PumpInterface;
import info.nightscout.androidaps.interfaces.PumpPluginBase;
import info.nightscout.androidaps.logging.AAPSLogger;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
import info.nightscout.androidaps.plugins.common.ManufacturerType;
@@ -80,7 +81,7 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP;
*/
@Singleton
public class ComboPlugin extends PumpPluginBase implements PumpInterface, ConstraintsInterface {
- private static final Logger log = LoggerFactory.getLogger(L.PUMP);
+ private static final Logger log = StacktraceLoggerWrapper.getLogger(L.PUMP);
static final String COMBO_TBRS_SET = "combo_tbrs_set";
static final String COMBO_BOLUSES_DELIVERED = "combo_boluses_delivered";
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java
index c057b9244b..b36a5f2a71 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java
@@ -26,6 +26,7 @@ import java.util.Date;
import java.util.List;
import java.util.Objects;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands.ReadQuickInfoCommand;
import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.PumpHistoryRequest;
import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands.BolusCommand;
@@ -45,7 +46,7 @@ import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands.SetT
* operations and are cleanly separated from the thread management, connection management etc
*/
public class RuffyScripter implements RuffyCommands {
- private static final Logger log = LoggerFactory.getLogger(RuffyScripter.class);
+ private static final Logger log = StacktraceLoggerWrapper.getLogger(RuffyScripter.class);
private IRuffyService ruffyService;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BolusCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BolusCommand.java
index da18cc5c53..42a94f78ff 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BolusCommand.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BolusCommand.java
@@ -11,6 +11,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.BolusProgressReporter;
import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpWarningCodes;
import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.WarningOrErrorCode;
@@ -23,7 +24,7 @@ import static info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.BolusP
import static info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.BolusProgressReporter.State.STOPPING;
public class BolusCommand extends BaseCommand {
- private static final Logger log = LoggerFactory.getLogger(BolusCommand.class);
+ private static final Logger log = StacktraceLoggerWrapper.getLogger(BolusCommand.class);
protected final double bolus;
private final BolusProgressReporter bolusProgressReporter;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CancelTbrCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CancelTbrCommand.java
index 4b54c87c42..b92aca13d5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CancelTbrCommand.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/CancelTbrCommand.java
@@ -4,11 +4,12 @@ import org.monkey.d.ruffy.ruffy.driver.display.MenuType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpState;
import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpWarningCodes;
public class CancelTbrCommand extends BaseCommand {
- private static final Logger log = LoggerFactory.getLogger(CancelTbrCommand.class);
+ private static final Logger log = StacktraceLoggerWrapper.getLogger(CancelTbrCommand.class);
@Override
public Integer getReconnectWarningId() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadBasalProfileCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadBasalProfileCommand.java
index b7145d233d..83e553df6c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadBasalProfileCommand.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadBasalProfileCommand.java
@@ -9,11 +9,12 @@ import org.slf4j.LoggerFactory;
import java.util.Arrays;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.BasalProfile;
import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpState;
public class ReadBasalProfileCommand extends BaseCommand {
- private static final Logger log = LoggerFactory.getLogger(ReadBasalProfileCommand.class);
+ private static final Logger log = StacktraceLoggerWrapper.getLogger(ReadBasalProfileCommand.class);
@Override
public void execute() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java
index b50ccaeb2c..40065ae7b1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java
@@ -12,6 +12,7 @@ import org.slf4j.LoggerFactory;
import java.util.Calendar;
import java.util.Date;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Bolus;
import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.PumpAlert;
import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.PumpHistory;
@@ -20,7 +21,7 @@ import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Tbr;
import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Tdd;
public class ReadHistoryCommand extends BaseCommand {
- private static Logger log = LoggerFactory.getLogger(ReadHistoryCommand.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(ReadHistoryCommand.class);
private final PumpHistoryRequest request;
private final PumpHistory history = new PumpHistory();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadQuickInfoCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadQuickInfoCommand.java
index eb68f1c5e1..86b21f43eb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadQuickInfoCommand.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadQuickInfoCommand.java
@@ -9,11 +9,12 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Bolus;
import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.PumpHistory;
public class ReadQuickInfoCommand extends BaseCommand {
- private static final Logger log = LoggerFactory.getLogger(ReadQuickInfoCommand.class);
+ private static final Logger log = StacktraceLoggerWrapper.getLogger(ReadQuickInfoCommand.class);
private final int numberOfBolusRecordsToRetrieve;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetBasalProfileCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetBasalProfileCommand.java
index 4d18b3d24e..c10f863850 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetBasalProfileCommand.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetBasalProfileCommand.java
@@ -12,11 +12,12 @@ import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.BasalProfile;
import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpState;
public class SetBasalProfileCommand extends BaseCommand {
- private static final Logger log = LoggerFactory.getLogger(SetBasalProfileCommand.class);
+ private static final Logger log = StacktraceLoggerWrapper.getLogger(SetBasalProfileCommand.class);
private final BasalProfile basalProfile;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetTbrCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetTbrCommand.java
index a4459cea66..1d8e1b8d4a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetTbrCommand.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/SetTbrCommand.java
@@ -12,12 +12,13 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpState;
import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.PumpWarningCodes;
import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.WarningOrErrorCode;
public class SetTbrCommand extends BaseCommand {
- private static final Logger log = LoggerFactory.getLogger(SetTbrCommand.class);
+ private static final Logger log = StacktraceLoggerWrapper.getLogger(SetTbrCommand.class);
private final long percentage;
private final long duration;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
index 5b25a8f6a9..dcc19b66b4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
@@ -30,6 +30,7 @@ import info.nightscout.androidaps.interfaces.PumpInterface;
import info.nightscout.androidaps.interfaces.PumpPluginBase;
import info.nightscout.androidaps.logging.AAPSLogger;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
import info.nightscout.androidaps.plugins.pump.common.data.PumpStatus;
@@ -54,7 +55,7 @@ import io.reactivex.schedulers.Schedulers;
public abstract class PumpPluginAbstract extends PumpPluginBase implements PumpInterface, ConstraintsInterface {
private CompositeDisposable disposable = new CompositeDisposable();
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMP);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMP);
/*
protected static final PumpEnactResult OPERATION_NOT_SUPPORTED = new PumpEnactResult().success(false)
.enacted(false).comment(MainApp.gs(R.string.pump_operation_not_supported_by_pump_driver));
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt
index d7833a4fe4..f3b5ad1585 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.pump.common.bolusInfo
import info.nightscout.androidaps.data.DetailedBolusInfo
import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper
import info.nightscout.androidaps.plugins.pump.medtronic.data.MedtronicHistoryData
import info.nightscout.androidaps.utils.T
import org.slf4j.LoggerFactory
@@ -9,7 +10,7 @@ import java.util.*
import kotlin.math.abs
object DetailedBolusInfoStorage {
- private val log = LoggerFactory.getLogger(L.PUMP)
+ private val log = StacktraceLoggerWrapper.getLogger(L.PUMP)
val store = ArrayList()
@Synchronized
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java
index 2d5c0dde7d..e558ec287a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java
@@ -43,6 +43,7 @@ import java.util.Map;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
@@ -56,7 +57,7 @@ import info.nightscout.androidaps.utils.SP;
// IMPORTANT: This activity needs to be called from RileyLinkSelectPreference (see pref_medtronic.xml as example)
public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
- private static final Logger LOG = LoggerFactory.getLogger(RileyLinkBLEScanActivity.class);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(RileyLinkBLEScanActivity.class);
private static final int PERMISSION_REQUEST_COARSE_LOCATION = 30241; // arbitrary.
private static final int REQUEST_ENABLE_BT = 30242; // arbitrary
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java
index 69837afd7c..5a30a75fe1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java
@@ -6,6 +6,7 @@ import org.slf4j.LoggerFactory;
import android.content.Context;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.data.PumpStatus;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkCommunicationException;
@@ -32,7 +33,7 @@ import info.nightscout.androidaps.utils.SP;
*/
public abstract class RileyLinkCommunicationManager {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
private static final int SCAN_TIMEOUT = 1500;
private static final int ALLOWED_PUMP_UNREACHABLE = 10 * 60 * 1000; // 10 minutes
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkUtil.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkUtil.java
index ac5bbd12a0..71006e2c34 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkUtil.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkUtil.java
@@ -16,6 +16,7 @@ import java.util.List;
import java.util.UUID;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkBLE;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.encoding.Encoding4b6b;
@@ -43,7 +44,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicDe
public class RileyLinkUtil {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMP);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMP);
protected static List historyRileyLink = new ArrayList<>();
protected static RileyLinkCommunicationManager rileyLinkCommunicationManager;
static ServiceTask currentTask;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java
index 1fb24821e1..031de05e23 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java
@@ -10,6 +10,7 @@ import java.util.UUID;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.Reset;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.RileyLinkCommand;
@@ -40,7 +41,7 @@ public class RFSpy {
public static final long RILEYLINK_FREQ_XTAL = 24000000;
public static final int EXPECTED_MAX_BLUETOOTH_LATENCY_MS = 7500; // 1500
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMPBTCOMM);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPBTCOMM);
public int notConnectedCount = 0;
private RileyLinkBLE rileyLinkBle;
private RFSpyReader reader;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyReader.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyReader.java
index 063cdb877b..69b1f245fd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyReader.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyReader.java
@@ -12,6 +12,7 @@ import android.os.AsyncTask;
import android.os.SystemClock;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.GattAttributes;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkEncodingType;
@@ -24,7 +25,7 @@ import info.nightscout.androidaps.plugins.pump.common.utils.ThreadUtil;
*/
public class RFSpyReader {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMPBTCOMM);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPBTCOMM);
private static AsyncTask readerTask;
private RileyLinkBLE rileyLinkBle;
private Semaphore waitForRadioData = new Semaphore(0, true);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.java
index aab5e35142..42b7f8ce6e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.java
@@ -20,6 +20,7 @@ import java.util.UUID;
import java.util.concurrent.Semaphore;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.GattAttributes;
@@ -39,7 +40,7 @@ import info.nightscout.androidaps.plugins.pump.common.utils.ThreadUtil;
*/
public class RileyLinkBLE {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMPBTCOMM);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPBTCOMM);
private final Context context;
public boolean gattDebugEnabled = true;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioResponse.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioResponse.java
index 646d7aac9a..2b170cd0fb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioResponse.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioResponse.java
@@ -5,6 +5,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkCommunicationException;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.RileyLinkCommand;
@@ -19,7 +20,7 @@ import info.nightscout.androidaps.plugins.pump.common.utils.CRC;
*/
public class RadioResponse {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMPBTCOMM);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPBTCOMM);
public boolean decodedOK = false;
public int rssi;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGeoff.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGeoff.java
index 40f24cf135..47f13f3095 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGeoff.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGeoff.java
@@ -6,6 +6,7 @@ import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkCommunicationException;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkBLEError;
import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
@@ -16,7 +17,7 @@ import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
public class Encoding4b6bGeoff extends Encoding4b6bAbstract {
- public static final Logger LOG = LoggerFactory.getLogger(Encoding4b6bGeoff.class);
+ public static final Logger LOG = StacktraceLoggerWrapper.getLogger(Encoding4b6bGeoff.class);
public byte[] encode4b6b(byte[] data) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGo.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGo.java
index 6609138011..6b4bd73760 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGo.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGo.java
@@ -6,6 +6,7 @@ import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkCommunicationException;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkBLEError;
import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
@@ -16,7 +17,7 @@ import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
public class Encoding4b6bGo extends Encoding4b6bAbstract {
- public static final Logger LOG = LoggerFactory.getLogger(Encoding4b6bGo.class);
+ public static final Logger LOG = StacktraceLoggerWrapper.getLogger(Encoding4b6bGo.class);
private static Map decodeGoMap;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bLoop.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bLoop.java
index a7b005b9b8..56ec7751a5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bLoop.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bLoop.java
@@ -8,6 +8,7 @@ import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkCommunicationException;
import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
@@ -16,9 +17,8 @@ import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
*/
public class Encoding4b6bLoop extends Encoding4b6bAbstract {
- private static final Logger log = LoggerFactory.getLogger(Encoding4b6bLoop.class);
+ private static final Logger log = StacktraceLoggerWrapper.getLogger(Encoding4b6bLoop.class);
- public static final Logger LOG = LoggerFactory.getLogger(Encoding4b6bLoop.class);
public Map codesRev = null;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicReadOperation.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicReadOperation.java
index 6c12a8ef77..a891fce501 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicReadOperation.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicReadOperation.java
@@ -11,6 +11,7 @@ import android.bluetooth.BluetoothGattCharacteristic;
import android.os.SystemClock;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkBLE;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.GattAttributes;
@@ -19,7 +20,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.Gatt
*/
public class CharacteristicReadOperation extends BLECommOperation {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMPBTCOMM);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPBTCOMM);
private BluetoothGattCharacteristic characteristic;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicWriteOperation.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicWriteOperation.java
index 488b03af27..54f20d517d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicWriteOperation.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicWriteOperation.java
@@ -11,6 +11,7 @@ import android.bluetooth.BluetoothGattCharacteristic;
import android.os.SystemClock;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkBLE;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.GattAttributes;
@@ -19,7 +20,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.Gatt
*/
public class CharacteristicWriteOperation extends BLECommOperation {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMPBTCOMM);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPBTCOMM);
private BluetoothGattCharacteristic characteristic;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/DescriptorWriteOperation.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/DescriptorWriteOperation.java
index 9e631c1c7c..82f3359198 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/DescriptorWriteOperation.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/DescriptorWriteOperation.java
@@ -10,6 +10,7 @@ import android.bluetooth.BluetoothGatt;
import android.bluetooth.BluetoothGattDescriptor;
import android.os.SystemClock;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkBLE;
/**
@@ -17,7 +18,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLink
*/
public class DescriptorWriteOperation extends BLECommOperation {
- private static final Logger LOG = LoggerFactory.getLogger(DescriptorWriteOperation.class);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(DescriptorWriteOperation.class);
private BluetoothGattDescriptor descr;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBluetoothStateReceiver.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBluetoothStateReceiver.java
index 78b7def1af..9a99a4a965 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBluetoothStateReceiver.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBluetoothStateReceiver.java
@@ -12,13 +12,14 @@ import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.interfaces.PumpInterface;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
public class RileyLinkBluetoothStateReceiver extends BroadcastReceiver {
- private static Logger LOG = LoggerFactory.getLogger(L.PUMP);
+ private static Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMP);
@Override
public void onReceive(Context context, Intent intent) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.java
index d8a897955e..9dfb05fc63 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.java
@@ -20,6 +20,7 @@ import java.util.List;
import java.util.Map;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkFirmwareVersion;
@@ -39,7 +40,7 @@ import info.nightscout.androidaps.utils.SP;
*/
public class RileyLinkBroadcastReceiver extends BroadcastReceiver {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
RileyLinkService serviceInstance;
protected Map> broadcastIdentifiers = null;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java
index 29781d191b..af5769a08b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java
@@ -12,6 +12,7 @@ import android.content.Intent;
import android.content.IntentFilter;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
@@ -33,7 +34,7 @@ import info.nightscout.androidaps.utils.SP;
*/
public abstract class RileyLinkService extends Service {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public RileyLinkBLE rileyLinkBLE; // android-bluetooth management
protected BluetoothAdapter bluetoothAdapter;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.java
index 9856b21b66..1697e0640d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.java
@@ -6,6 +6,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkError;
@@ -24,7 +25,7 @@ public class InitializePumpManagerTask extends ServiceTask {
private static final String TAG = "InitPumpManagerTask";
private RileyLinkTargetDevice targetDevice;
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public InitializePumpManagerTask(RileyLinkTargetDevice targetDevice) {
super();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java
index 783553f431..17dfd96083 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java
@@ -13,13 +13,14 @@ import java.util.Calendar;
import java.util.GregorianCalendar;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
/**
* This is simple version of ATechDate, limited only to one format (yyyymmddHHMIss)
*/
public class DateTimeUtil {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
/**
* DateTime is packed as long: yyyymmddHHMMss
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
index 9880aed104..94d3f7ffb0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
@@ -29,6 +29,7 @@ import info.nightscout.androidaps.interfaces.PumpPluginBase;
import info.nightscout.androidaps.logging.AAPSLogger;
import info.nightscout.androidaps.logging.L;
import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.common.ManufacturerType;
import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
@@ -51,7 +52,7 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper;
*/
public abstract class AbstractDanaRPlugin extends PumpPluginBase implements PumpInterface, DanaRInterface, ConstraintsInterface {
- private Logger log = LoggerFactory.getLogger(L.PUMP);
+ private Logger log = StacktraceLoggerWrapper.getLogger(L.PUMP);
protected AbstractDanaRExecutionService sExecutionService;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/SerialIOThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/SerialIOThread.java
index 7b45518015..652ecf88b9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/SerialIOThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/SerialIOThread.java
@@ -11,6 +11,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageHashTableBase;
import info.nightscout.androidaps.plugins.pump.danaR.services.AbstractSerialIOThread;
@@ -20,7 +21,7 @@ import info.nightscout.androidaps.utils.CRC;
* Created by mike on 17.07.2016.
*/
public class SerialIOThread extends AbstractSerialIOThread {
- private static Logger log = LoggerFactory.getLogger(L.PUMPBTCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPBTCOMM);
private InputStream mInputStream = null;
private OutputStream mOutputStream = null;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRNSHistorySync.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRNSHistorySync.java
index c6a8cf72c3..675a7214b6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRNSHistorySync.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRNSHistorySync.java
@@ -14,6 +14,7 @@ import info.nightscout.androidaps.data.Profile;
import info.nightscout.androidaps.db.CareportalEvent;
import info.nightscout.androidaps.db.DanaRHistoryRecord;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes;
@@ -26,7 +27,7 @@ import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
*/
public class DanaRNSHistorySync {
- private static Logger log = LoggerFactory.getLogger(L.PUMP);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMP);
private List historyRecords;
private final static int SYNC_BOLUS = 0b00000001;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageBase.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageBase.java
index bf2ca4b83b..90a59929c6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageBase.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageBase.java
@@ -13,6 +13,7 @@ import java.util.Date;
import java.util.GregorianCalendar;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.utils.CRC;
/*
@@ -22,7 +23,7 @@ import info.nightscout.androidaps.utils.CRC;
*/
public class MessageBase {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
protected byte[] buffer = new byte[512];
private int position = 6;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNames.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNames.java
index 2cba96f838..13d303e532 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNames.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNames.java
@@ -6,12 +6,13 @@ import org.slf4j.LoggerFactory;
import java.util.HashMap;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
/**
* Created by mike on 28.05.2016.
*/
public class MessageOriginalNames {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
private static HashMap messageNames;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgress.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgress.java
index 235197721d..898d1c4cd8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgress.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgress.java
@@ -6,12 +6,13 @@ import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
import info.nightscout.androidaps.plugins.treatments.Treatment;
public class MsgBolusProgress extends MessageBase {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
private static Treatment t;
private static double amount;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.java
index f3cd33478d..97ab648610 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.java
@@ -5,10 +5,11 @@ import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.interfaces.Constraint;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
public class MsgBolusStart extends MessageBase {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public static int errorCode;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.java
index de73ff0491..f609d1daba 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.java
@@ -5,10 +5,11 @@ import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.interfaces.Constraint;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
public class MsgBolusStartWithSpeed extends MessageBase {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public static int errorCode;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStop.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStop.java
index 5108729196..9fc1e33b2e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStop.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStop.java
@@ -6,12 +6,13 @@ import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
import info.nightscout.androidaps.plugins.treatments.Treatment;
public class MsgBolusStop extends MessageBase {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
private static Treatment t;
private static Double amount;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgError.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgError.java
index 64fffc7bb3..9164a936b1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgError.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgError.java
@@ -6,12 +6,13 @@ import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
public class MsgError extends MessageBase {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public MsgError() {
SetCommand(0x0601);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarm.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarm.java
index 8abbf55c31..dce8007c2f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarm.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarm.java
@@ -4,12 +4,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
/**
* Created by mike on 20.07.2016.
*/
public class MsgHistoryAlarm extends MsgHistoryAll {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public MsgHistoryAlarm() {
SetCommand(0x3105);
if (L.isEnabled(L.PUMPCOMM))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.java
index 3f28fd230c..91f76f5e69 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.java
@@ -6,12 +6,13 @@ import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.db.DanaRHistoryRecord;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRSyncStatus;
import info.nightscout.androidaps.utils.DateUtil;
public class MsgHistoryAll extends MessageBase {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public MsgHistoryAll() {
SetCommand(0x41F2);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDone.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDone.java
index 7b110dd45f..2884dbb387 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDone.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDone.java
@@ -4,9 +4,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
public class MsgHistoryAllDone extends MessageBase {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public static boolean received = false;
public MsgHistoryAllDone() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHour.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHour.java
index 2599cc7434..e79384b5c3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHour.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHour.java
@@ -4,12 +4,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
/**
* Created by mike on 20.07.2016.
*/
public class MsgHistoryBasalHour extends MsgHistoryAll {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public MsgHistoryBasalHour() {
SetCommand(0x310A);
if (L.isEnabled(L.PUMPCOMM))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolus.java
index 88978be98c..e1b14defdb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolus.java
@@ -4,12 +4,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
/**
* Created by mike on 20.07.2016.
*/
public class MsgHistoryBolus extends MsgHistoryAll {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public MsgHistoryBolus() {
SetCommand(0x3101);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarbo.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarbo.java
index 5682c3c85f..9d9079b612 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarbo.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarbo.java
@@ -4,12 +4,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
/**
* Created by mike on 20.07.2016.
*/
public class MsgHistoryCarbo extends MsgHistoryAll {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public MsgHistoryCarbo() {
SetCommand(0x3107);
if (L.isEnabled(L.PUMPCOMM))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulin.java
index 2bed9419dd..3e5f5a4e15 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulin.java
@@ -4,12 +4,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
/**
* Created by mike on 20.07.2016.
*/
public class MsgHistoryDailyInsulin extends MsgHistoryAll {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public MsgHistoryDailyInsulin() {
SetCommand(0x3102);
if (L.isEnabled(L.PUMPCOMM))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDone.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDone.java
index eeaffd33a2..05c4b84f44 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDone.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDone.java
@@ -4,12 +4,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
/**
* Created by mike on 20.07.2016.
*/
public class MsgHistoryDone extends MessageBase {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public static boolean received = false;
public MsgHistoryDone() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryError.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryError.java
index 0666e8915a..ff820e9df9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryError.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryError.java
@@ -4,12 +4,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
/**
* Created by mike on 20.07.2016.
*/
public class MsgHistoryError extends MsgHistoryAll {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public MsgHistoryError() {
SetCommand(0x3106);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucose.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucose.java
index 114d392f40..3bb1b4e4a6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucose.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucose.java
@@ -4,12 +4,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
/**
* Created by mike on 20.07.2016.
*/
public class MsgHistoryGlucose extends MsgHistoryAll {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public MsgHistoryGlucose() {
SetCommand(0x3104);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNew.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNew.java
index e93c440fac..db026fae73 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNew.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNew.java
@@ -4,12 +4,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
/**
* Created by mike on 20.07.2016.
*/
public class MsgHistoryNew extends MsgHistoryAll {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public MsgHistoryNew() {
SetCommand(0x42F2);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDone.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDone.java
index c58f55f2cf..f70d298f87 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDone.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDone.java
@@ -4,12 +4,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
/**
* Created by mike on 20.07.2016.
*/
public class MsgHistoryNewDone extends MessageBase {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public static boolean received = false;
public MsgHistoryNewDone() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefill.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefill.java
index 1ccae856af..d8a5ee0faf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefill.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefill.java
@@ -4,12 +4,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
/**
* Created by mike on 20.07.2016.
*/
public class MsgHistoryRefill extends MsgHistoryAll {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public MsgHistoryRefill() {
SetCommand(0x3108);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspend.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspend.java
index 1dac016f4d..db297a8d0c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspend.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspend.java
@@ -4,12 +4,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
/**
* Created by mike on 20.07.2016.
*/
public class MsgHistorySuspend extends MsgHistoryAll {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public MsgHistorySuspend() {
SetCommand(0x3109);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStart.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStart.java
index 3d2084371c..35d9905656 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStart.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStart.java
@@ -4,9 +4,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
public class MsgPCCommStart extends MessageBase {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public MsgPCCommStart() {
SetCommand(0x3001);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStop.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStop.java
index e942f6b6e8..cbefd71b04 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStop.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStop.java
@@ -4,9 +4,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
public class MsgPCCommStop extends MessageBase {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public MsgPCCommStop() {
SetCommand(0x3002);
if (L.isEnabled(L.PUMPCOMM))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfile.java
index 22f962713b..dcecb40bea 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfile.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfile.java
@@ -4,9 +4,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
public class MsgSetActivateBasalProfile extends MessageBase {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public MsgSetActivateBasalProfile() {
SetCommand(0x330C);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfile.java
index 78473aa37e..251fea50c2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfile.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfile.java
@@ -6,12 +6,13 @@ import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
public class MsgSetBasalProfile extends MessageBase {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public MsgSetBasalProfile() {
SetCommand(0x3306);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntry.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntry.java
index a00b5bfd72..a12611eacf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntry.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntry.java
@@ -6,9 +6,10 @@ import org.slf4j.LoggerFactory;
import java.util.Calendar;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
public class MsgSetCarbsEntry extends MessageBase {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public MsgSetCarbsEntry() {
SetCommand(0x0402);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStart.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStart.java
index f6b3d85aa5..b7cc8eefd3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStart.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStart.java
@@ -5,10 +5,11 @@ import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.interfaces.Constraint;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
public class MsgSetExtendedBolusStart extends MessageBase {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public MsgSetExtendedBolusStart() {
SetCommand(0x0407);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStop.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStop.java
index a19efe7488..3bbaede325 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStop.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStop.java
@@ -4,9 +4,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
public class MsgSetExtendedBolusStop extends MessageBase {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public MsgSetExtendedBolusStop() {
SetCommand(0x0406);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfile.java
index 76a322b55c..42f655f7ab 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfile.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfile.java
@@ -6,12 +6,13 @@ import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
public class MsgSetSingleBasalProfile extends MessageBase {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public MsgSetSingleBasalProfile() {
SetCommand(0x3302);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStart.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStart.java
index adc6a0b4da..1bd278f49c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStart.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStart.java
@@ -4,9 +4,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
public class MsgSetTempBasalStart extends MessageBase {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public MsgSetTempBasalStart() {
SetCommand(0x0401);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStop.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStop.java
index 19427ee965..236b22fb30 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStop.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStop.java
@@ -4,9 +4,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
public class MsgSetTempBasalStop extends MessageBase {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public MsgSetTempBasalStop() {
SetCommand(0x0403);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTime.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTime.java
index 2840ff3faa..8642569ee6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTime.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTime.java
@@ -6,6 +6,7 @@ import org.slf4j.LoggerFactory;
import java.util.Date;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.utils.DateUtil;
/**
@@ -13,7 +14,7 @@ import info.nightscout.androidaps.utils.DateUtil;
*/
public class MsgSetTime extends MessageBase {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
private static Date time;
public MsgSetTime(Date time) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractDanaRExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractDanaRExecutionService.java
index 4fab0a5980..e16ee6b856 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractDanaRExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractDanaRExecutionService.java
@@ -24,6 +24,7 @@ import info.nightscout.androidaps.data.Profile;
import info.nightscout.androidaps.data.PumpEnactResult;
import info.nightscout.androidaps.events.EventPumpStatusChanged;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStop;
@@ -50,7 +51,7 @@ import info.nightscout.androidaps.utils.ToastUtils;
*/
public abstract class AbstractDanaRExecutionService extends DaggerService {
- protected Logger log = LoggerFactory.getLogger(L.PUMP);
+ protected Logger log = StacktraceLoggerWrapper.getLogger(L.PUMP);
protected String mDevName;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
index 3a15a760f3..aef4dc137f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
@@ -10,8 +10,10 @@ import org.slf4j.LoggerFactory;
import java.nio.charset.StandardCharsets;
import java.util.Date;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
+
public class DanaRS_Packet {
- private static final Logger log = LoggerFactory.getLogger(DanaRS_Packet.class);
+ private static final Logger log = StacktraceLoggerWrapper.getLogger(DanaRS_Packet.class);
protected static final int TYPE_START = 0;
protected static final int OPCODE_START = 1;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.java
index 247d70d2b9..75ceba52ee 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.java
@@ -26,6 +26,7 @@ import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.events.EventPumpStatusChanged;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
@@ -43,7 +44,7 @@ import info.nightscout.androidaps.utils.SP;
*/
public class BLEComm {
- private Logger log = LoggerFactory.getLogger(L.PUMPBTCOMM);
+ private Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPBTCOMM);
private final long WRITE_DELAY_MILLIS = 50;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.java
index 709cb1fcce..55576eb46b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.java
@@ -13,6 +13,7 @@ import info.nightscout.androidaps.db.Source;
import info.nightscout.androidaps.db.TemporaryBasal;
import info.nightscout.androidaps.events.EventPumpStatusChanged;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage;
import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
@@ -21,7 +22,7 @@ import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
import info.nightscout.androidaps.utils.DateUtil;
public class MsgHistoryEvents_v2 extends MessageBase {
- private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public boolean done;
public static long lastEventTimeLoaded = 0;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2.java
index 875cd4ac64..4f3502de7a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2.java
@@ -4,10 +4,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
public class MsgSetAPSTempBasalStart_v2 extends MessageBase {
- private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
protected final int PARAM30MIN = 160;
protected final int PARAM15MIN = 150;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2.java
index b817495ba3..860e57cb4b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2.java
@@ -7,10 +7,11 @@ import java.util.Date;
import java.util.GregorianCalendar;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
public class MsgSetHistoryEntry_v2 extends MessageBase {
- private Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public MsgSetHistoryEntry_v2() {
SetCommand(0xE004);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
index 26555898c0..b57de9190b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
@@ -21,6 +21,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.insight.activities.InsightAlertActivity;
import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.ConfirmAlertMessage;
import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.SnoozeAlertMessage;
@@ -36,7 +37,7 @@ import info.nightscout.androidaps.plugins.pump.insight.utils.ExceptionTranslator
public class InsightAlertService extends Service implements InsightConnectionService.StateCallback {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
private LocalBinder localBinder = new LocalBinder();
private boolean connectionRequested;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
index 81c03f9e34..dca80e1296 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
@@ -49,6 +49,7 @@ import info.nightscout.androidaps.interfaces.PumpInterface;
import info.nightscout.androidaps.interfaces.PumpPluginBase;
import info.nightscout.androidaps.logging.AAPSLogger;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
import info.nightscout.androidaps.plugins.common.ManufacturerType;
import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
@@ -148,7 +149,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
private final SP sp;
private final CommandQueueProvider commandQueue;
- private Logger log = LoggerFactory.getLogger(L.PUMP);
+ private Logger log = StacktraceLoggerWrapper.getLogger(L.PUMP);
private PumpDescription pumpDescription;
private InsightAlertService alertService;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/HistoryEvent.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/HistoryEvent.java
index f6b3dc588c..4af9965a90 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/HistoryEvent.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/history/history_events/HistoryEvent.java
@@ -1,5 +1,6 @@
package info.nightscout.androidaps.plugins.pump.insight.app_layer.history.history_events;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.insight.ids.HistoryEventIDs;
import info.nightscout.androidaps.plugins.pump.insight.utils.BOCUtil;
import info.nightscout.androidaps.plugins.pump.insight.utils.ByteBuf;
@@ -7,7 +8,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class HistoryEvent implements Comparable {
- private static final Logger log = LoggerFactory.getLogger(HistoryEvent.class);
+ private static final Logger log = StacktraceLoggerWrapper.getLogger(HistoryEvent.class);
private int eventYear;
private int eventMonth;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java
index cecb631776..ab988b879f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.insight.app_layer.AppLayerMessage;
import info.nightscout.androidaps.plugins.pump.insight.app_layer.ReadParameterBlockMessage;
import info.nightscout.androidaps.plugins.pump.insight.app_layer.configuration.CloseConfigurationWriteSessionMessage;
@@ -86,7 +87,7 @@ import info.nightscout.androidaps.utils.SP;
public class InsightConnectionService extends Service implements ConnectionEstablisher.Callback, InputStreamReader.Callback, OutputStreamWriter.Callback {
- private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
private static final int BUFFER_SIZE = 1024;
private static final int TIMEOUT_DURING_HANDSHAKE_NOTIFICATION_THRESHOLD = 3;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.java
index 6e0319f35d..c1419c25b8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.java
@@ -26,6 +26,7 @@ import info.nightscout.androidaps.interfaces.PumpInterface;
import info.nightscout.androidaps.interfaces.PumpPluginBase;
import info.nightscout.androidaps.logging.AAPSLogger;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
import info.nightscout.androidaps.plugins.common.ManufacturerType;
import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
@@ -42,7 +43,7 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper;
*/
@Singleton
public class MDIPlugin extends PumpPluginBase implements PumpInterface {
- private static Logger log = LoggerFactory.getLogger(MDIPlugin.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(MDIPlugin.class);
private PumpDescription pumpDescription = new PumpDescription();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
index e3ad0abfb8..9e1f588a41 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
@@ -43,6 +43,7 @@ import info.nightscout.androidaps.interfaces.PluginType;
import info.nightscout.androidaps.interfaces.PumpInterface;
import info.nightscout.androidaps.logging.AAPSLogger;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
import info.nightscout.androidaps.plugins.common.ManufacturerType;
@@ -106,7 +107,7 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
private final RxBusWrapper rxBus;
private final CommandQueueProvider commandQueue;
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMP);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMP);
protected static MedtronicPumpPlugin plugin = null;
private RileyLinkMedtronicService medtronicService;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
index e054539e8f..81d1425e91 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
@@ -13,6 +13,7 @@ import java.util.List;
import java.util.Map;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy;
@@ -57,7 +58,7 @@ import info.nightscout.androidaps.utils.SP;
*/
public class MedtronicCommunicationManager extends RileyLinkCommunicationManager {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
private static final int MAX_COMMAND_TRIES = 3;
private static final int DEFAULT_TIMEOUT = 2000;
private static final long RILEYLINK_TIMEOUT = 15 * 60 * 1000; // 15 min
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.java
index dc0a35f2e8..9fb871c45a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.java
@@ -9,6 +9,7 @@ import java.util.HashMap;
import java.util.Map;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfile;
@@ -27,7 +28,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
public class MedtronicConverter {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
MedtronicDeviceType pumpModel;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.java
index fa0e58a15a..4a2fa12a28 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.java
@@ -10,6 +10,7 @@ import java.util.List;
import java.util.Map;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType;
@@ -25,7 +26,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
public abstract class MedtronicHistoryDecoder implements MedtronicHistoryDecoderInterface {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
protected ByteUtil bitUtils;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.java
index 3b9dfbb48d..fb42eca31c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.java
@@ -9,6 +9,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
@@ -24,7 +25,7 @@ public abstract class MedtronicHistoryEntry implements MedtronicHistoryEntryInte
protected List rawData;
- public static final Logger LOG = LoggerFactory.getLogger(MedtronicHistoryEntry.class);
+ public static final Logger LOG = StacktraceLoggerWrapper.getLogger(MedtronicHistoryEntry.class);
protected int[] sizes = new int[3];
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.java
index 77ae298235..86c463cc0f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.java
@@ -6,6 +6,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
import info.nightscout.androidaps.plugins.pump.common.utils.CRC;
import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
@@ -15,7 +16,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
*/
public class RawHistoryPage {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMPBTCOMM);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPBTCOMM);
private byte[] data = new byte[0];
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.java
index 5a0f1e7983..e2bf3a4935 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.java
@@ -9,6 +9,7 @@ import java.util.Arrays;
import java.util.List;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.MedtronicHistoryDecoder;
import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.RecordDecodeStatus;
@@ -22,7 +23,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.RecordDeco
public class MedtronicCGMSHistoryDecoder extends MedtronicHistoryDecoder {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
// CGMSValuesWriter cgmsValuesWriter = null;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.java
index 71f387d176..29b30b01a3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.java
@@ -10,6 +10,7 @@ import java.util.List;
import java.util.Locale;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.MedtronicHistoryDecoder;
@@ -32,7 +33,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
public class MedtronicPumpHistoryDecoder extends MedtronicHistoryDecoder {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
private PumpHistoryEntry tbrPreviousRecord;
private PumpHistoryEntry changeTimeRecord;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.java
index 5a290c6a02..84e021e1bb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.java
@@ -7,6 +7,7 @@ import org.slf4j.LoggerFactory;
import java.util.Objects;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.MedtronicHistoryEntry;
@@ -20,7 +21,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.MedtronicH
public class PumpHistoryEntry extends MedtronicHistoryEntry {
- private static Logger LOG = LoggerFactory.getLogger(PumpHistoryEntry.class);
+ private static Logger LOG = StacktraceLoggerWrapper.getLogger(PumpHistoryEntry.class);
@Expose
private PumpHistoryEntryType entryType;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.java
index 58c9b77d6b..f5ffb13a73 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.java
@@ -8,6 +8,7 @@ import java.util.Collections;
import java.util.List;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
/**
@@ -17,7 +18,7 @@ import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
*/
public class PumpHistoryResult {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
private boolean searchFinished = false;
private PumpHistoryEntry searchEntry = null;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.java
index 4d81d81bfe..9d63574748 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.java
@@ -4,6 +4,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RLMessage;
import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType;
@@ -13,7 +14,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandTy
*/
public class PumpMessage implements RLMessage {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public PacketType packetType = PacketType.Carelink;
public byte[] address = new byte[]{0, 0, 0};
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.java
index 35fa184147..28af3befef 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.java
@@ -4,6 +4,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
import info.nightscout.androidaps.plugins.pump.medtronic.comm.MedtronicCommunicationManager;
@@ -15,7 +16,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
*/
public class MedtronicUIComm {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMP);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMP);
MedtronicCommunicationManager mcmInstance = null;
MedtronicUIPostprocessor uiPostprocessor = new MedtronicUIPostprocessor();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.java
index e79531d4fc..c6f62c5796 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.java
@@ -9,6 +9,7 @@ import java.util.Date;
import java.util.Map;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfile;
import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BatteryStatusDTO;
import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.ClockDTO;
@@ -27,7 +28,7 @@ import static info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUt
public class MedtronicUIPostprocessor {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMP);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMP);
MedtronicPumpStatus pumpStatus;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.java
index 9080f5b564..0a52785e40 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.java
@@ -6,6 +6,7 @@ import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.pump.medtronic.comm.MedtronicCommunicationManager;
import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry;
@@ -24,7 +25,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
public class MedtronicUITask {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMP);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMP);
public MedtronicCommandType commandType;
public Object returnData;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
index 11d1bad3d9..e91e56b607 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
@@ -30,6 +30,7 @@ import info.nightscout.androidaps.db.Source;
import info.nightscout.androidaps.db.TDD;
import info.nightscout.androidaps.db.TemporaryBasal;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
@@ -69,7 +70,7 @@ import info.nightscout.androidaps.utils.SP;
// All things marked with "TODO: Fix db code" needs to be updated in new 2.5 database code
public class MedtronicHistoryData {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMP);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMP);
private List allHistory = null;
private List newHistory = null;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.java
index 25facaf9e6..9956e9103e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.java
@@ -10,6 +10,7 @@ import java.util.ArrayList;
import java.util.List;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
@@ -31,7 +32,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
*/
public class BasalProfile {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public static final int MAX_RAW_DATA_SIZE = (48 * 3) + 1;
private static final boolean DEBUG_BASALPROFILE = false;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.java
index 9768ad2fc8..757ffc2f79 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.java
@@ -5,6 +5,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
/**
@@ -14,7 +15,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
*/
public class BasalProfileEntry {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
public byte[] rate_raw;
public double rate;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.java
index 495bce8a31..01327a8ea4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.java
@@ -8,6 +8,7 @@ import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.db.TDD;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
@@ -23,7 +24,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpH
public class DailyTotalsDTO {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
// bg avg, bg low hi, number Bgs,
// Sen Avg, Sen Lo/Hi, Sens Cal/Data = 0/0,
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java
index 7a17767243..850df2ccc0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java
@@ -10,6 +10,7 @@ import java.util.List;
import java.util.Locale;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
@@ -20,7 +21,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
*/
public class TempBasalPair {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
@Expose
private double insulinRate = 0.0d;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.java
index 7641e5c4cb..7a2004cbfa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.java
@@ -22,13 +22,14 @@ import java.util.List;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin;
import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry;
import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntryGroup;
public class MedtronicHistoryActivity extends NoSplashAppCompatActivity {
- private static Logger LOG = LoggerFactory.getLogger(L.PUMP);
+ private static Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMP);
Spinner historyTypeSpinner;
TextView statusView;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.java
index fc1208a340..315aeb0869 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.java
@@ -14,6 +14,7 @@ import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.interfaces.PumpDescription;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.data.PumpStatus;
import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
@@ -37,7 +38,7 @@ import info.nightscout.androidaps.utils.SP;
public class MedtronicPumpStatus extends PumpStatus {
- private static Logger LOG = LoggerFactory.getLogger(L.PUMP);
+ private static Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMP);
public String errorDescription = null;
public String serialNumber;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java
index cba33353f1..6eacb1a63f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java
@@ -11,6 +11,7 @@ import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
@@ -36,7 +37,7 @@ import info.nightscout.androidaps.utils.SP;
*/
public class RileyLinkMedtronicService extends RileyLinkService {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
private static RileyLinkMedtronicService instance;
private static ServiceTask currentTask = null;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.java
index 1e1fe0abb8..adc3f2bd95 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.java
@@ -19,6 +19,7 @@ import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.interfaces.PluginType;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
@@ -47,7 +48,7 @@ import info.nightscout.androidaps.utils.OKDialog;
public class MedtronicUtil extends RileyLinkUtil {
- private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+ private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
static int ENVELOPE_SIZE = 4; // 0xA7 S1 S2 S3 CMD PARAM_COUNT [PARAMS]
static int CRC_SIZE = 1;
private static boolean lowLevelDebug = true;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.java
index 37abd8238f..6c8f061417 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.java
@@ -9,6 +9,7 @@ import info.nightscout.androidaps.interfaces.PluginDescription;
import info.nightscout.androidaps.interfaces.SensitivityInterface;
import info.nightscout.androidaps.logging.AAPSLogger;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
import info.nightscout.androidaps.utils.Round;
@@ -18,7 +19,7 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper;
public abstract class AbstractSensitivityPlugin extends PluginBase implements SensitivityInterface {
- private static final Logger log = LoggerFactory.getLogger(L.AUTOSENS);
+ private static final Logger log = StacktraceLoggerWrapper.getLogger(L.AUTOSENS);
public AbstractSensitivityPlugin(PluginDescription pluginDescription, AAPSLogger aapsLogger, ResourceHelper resourceHelper) {
super(pluginDescription, aapsLogger, resourceHelper);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.java
index 0065f72f4c..81d58ba74d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.java
@@ -22,6 +22,7 @@ import info.nightscout.androidaps.interfaces.PluginDescription;
import info.nightscout.androidaps.interfaces.PluginType;
import info.nightscout.androidaps.logging.AAPSLogger;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData;
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
@@ -36,7 +37,7 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper;
@Singleton
public class SensitivityAAPSPlugin extends AbstractSensitivityPlugin {
- private static Logger log = LoggerFactory.getLogger(L.AUTOSENS);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.AUTOSENS);
@Inject
public SensitivityAAPSPlugin(
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref0Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref0Plugin.java
index 16a20a740a..6fe086d387 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref0Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref0Plugin.java
@@ -22,6 +22,7 @@ import info.nightscout.androidaps.interfaces.PluginDescription;
import info.nightscout.androidaps.interfaces.PluginType;
import info.nightscout.androidaps.logging.AAPSLogger;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData;
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
@@ -34,7 +35,7 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper;
*/
@Singleton
public class SensitivityOref0Plugin extends AbstractSensitivityPlugin {
- private static Logger log = LoggerFactory.getLogger(L.AUTOSENS);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.AUTOSENS);
@Inject
public SensitivityOref0Plugin(
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java
index 31ff8afae1..8f47ae1757 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java
@@ -22,6 +22,7 @@ import info.nightscout.androidaps.interfaces.PluginDescription;
import info.nightscout.androidaps.interfaces.PluginType;
import info.nightscout.androidaps.logging.AAPSLogger;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData;
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
@@ -34,7 +35,7 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper;
*/
@Singleton
public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
- private static Logger log = LoggerFactory.getLogger(L.AUTOSENS);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.AUTOSENS);
@Inject
public SensitivityOref1Plugin(
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.java
index 219ce2a159..f02f73a120 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.java
@@ -20,6 +20,7 @@ import info.nightscout.androidaps.interfaces.PluginDescription;
import info.nightscout.androidaps.interfaces.PluginType;
import info.nightscout.androidaps.logging.AAPSLogger;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData;
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
@@ -33,7 +34,7 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper;
*/
@Singleton
public class SensitivityWeightedAveragePlugin extends AbstractSensitivityPlugin {
- private static Logger log = LoggerFactory.getLogger(L.AUTOSENS);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.AUTOSENS);
@Inject
public SensitivityWeightedAveragePlugin(
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
index bca2e84f9f..c61b5bb3f6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
@@ -37,6 +37,7 @@ import info.nightscout.androidaps.events.EventNsTreatment;
import info.nightscout.androidaps.events.EventReloadTreatmentData;
import info.nightscout.androidaps.events.EventTreatmentChange;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData;
import info.nightscout.androidaps.plugins.pump.medtronic.data.MedtronicHistoryData;
@@ -52,7 +53,7 @@ import io.reactivex.schedulers.Schedulers;
*/
public class TreatmentService extends OrmLiteBaseService {
- private static Logger log = LoggerFactory.getLogger(L.DATATREATMENTS);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.DATATREATMENTS);
private CompositeDisposable disposable = new CompositeDisposable();
private static final ScheduledExecutorService treatmentEventWorker = Executors.newSingleThreadScheduledExecutor();
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java b/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java
index d77635713b..dac1d4dbdc 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java
@@ -14,6 +14,7 @@ import info.nightscout.androidaps.R;
import info.nightscout.androidaps.events.EventPumpStatusChanged;
import info.nightscout.androidaps.interfaces.PumpInterface;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning;
@@ -26,7 +27,7 @@ import info.nightscout.androidaps.utils.T;
*/
public class QueueThread extends Thread {
- private Logger log = LoggerFactory.getLogger(L.PUMPQUEUE);
+ private Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPQUEUE);
private CommandQueue queue;
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.java b/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.java
index 6c2e7c6920..48b5d479f7 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.java
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.java
@@ -8,10 +8,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.services.DataService;
public class DataReceiver extends WakefulBroadcastReceiver {
- private static Logger log = LoggerFactory.getLogger(L.DATASERVICE);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.DATASERVICE);
@Override
public void onReceive(Context context, Intent intent) {
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.java b/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.java
index e4fd05d174..743507d068 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.java
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.java
@@ -16,11 +16,12 @@ import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.events.EventNetworkChange;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
public class NetworkChangeReceiver extends BroadcastReceiver {
- private static Logger log = LoggerFactory.getLogger(L.CORE);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.CORE);
private static EventNetworkChange lastEvent = null;
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/TimeDateOrTZChangeReceiver.java b/app/src/main/java/info/nightscout/androidaps/receivers/TimeDateOrTZChangeReceiver.java
index e74dfec20d..97c7af3ee0 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/TimeDateOrTZChangeReceiver.java
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/TimeDateOrTZChangeReceiver.java
@@ -12,11 +12,12 @@ import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.interfaces.PumpInterface;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
public class TimeDateOrTZChangeReceiver extends BroadcastReceiver {
- private static Logger LOG = LoggerFactory.getLogger(L.PUMP);
+ private static Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMP);
@Override
public void onReceive(Context context, Intent intent) {
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWBreak.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWBreak.java
index c6a9cf3f86..424a0b4d8e 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWBreak.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWBreak.java
@@ -8,11 +8,12 @@ import android.widget.TextView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.setupwizard.SWValidator;
public class SWBreak extends SWItem {
- private static Logger log = LoggerFactory.getLogger(SWBreak.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(SWBreak.class);
private TextView l;
private SWValidator visibilityValidator;
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWButton.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWButton.java
index afa28c1803..ed5c3c8914 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWButton.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWButton.java
@@ -8,10 +8,11 @@ import android.widget.LinearLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.setupwizard.SWValidator;
public class SWButton extends SWItem {
- private static Logger log = LoggerFactory.getLogger(SWButton.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(SWButton.class);
private Runnable buttonRunnable;
private int buttonText;
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWCheckbox.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWCheckbox.java
index d8194cbfc0..3a6d5d30b0 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWCheckbox.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWCheckbox.java
@@ -14,6 +14,7 @@ import java.util.ArrayList;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.interfaces.PluginBase;
import info.nightscout.androidaps.interfaces.PluginType;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.utils.SP;
/**
@@ -21,7 +22,7 @@ import info.nightscout.androidaps.utils.SP;
*/
public class SWCheckbox extends SWItem {
- private static Logger log = LoggerFactory.getLogger(SWCheckbox.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(SWCheckbox.class);
int labelsArray;
int valuesArray;
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditString.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditString.java
index b16164c064..1dbfbfe99e 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditString.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditString.java
@@ -13,12 +13,13 @@ import android.widget.TextView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.setupwizard.SWTextValidator;
import info.nightscout.androidaps.utils.SP;
public class SWEditString extends SWItem {
- private static Logger log = LoggerFactory.getLogger(SWEditString.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(SWEditString.class);
private SWTextValidator validator = null;
private int updateDelay = 0;
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditUrl.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditUrl.java
index 9589304374..937b8c8311 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditUrl.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditUrl.java
@@ -16,12 +16,13 @@ import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.setupwizard.events.EventSWLabel;
import info.nightscout.androidaps.utils.SP;
public class SWEditUrl extends SWItem {
- private static Logger log = LoggerFactory.getLogger(SWEditUrl.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(SWEditUrl.class);
private int updateDelay = 0;
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWHtmlLink.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWHtmlLink.java
index fd4ffdd524..f2eb1bd1ce 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWHtmlLink.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWHtmlLink.java
@@ -9,11 +9,12 @@ import android.widget.TextView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.setupwizard.SWValidator;
public class SWHtmlLink extends SWItem {
- private static Logger log = LoggerFactory.getLogger(SWHtmlLink.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(SWHtmlLink.class);
private String textLabel = null;
private TextView l;
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWInfotext.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWInfotext.java
index 91e5c2da2d..a328d639ec 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWInfotext.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWInfotext.java
@@ -8,11 +8,12 @@ import android.widget.TextView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.setupwizard.SWValidator;
public class SWInfotext extends SWItem {
- private static Logger log = LoggerFactory.getLogger(SWInfotext.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(SWInfotext.class);
private String textLabel = null;
private TextView l;
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.java
index 5a80148a85..994acc4e0b 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.java
@@ -16,12 +16,13 @@ import java.util.concurrent.TimeUnit;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.events.EventPreferenceChange;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.setupwizard.events.EventSWUpdate;
import info.nightscout.androidaps.utils.SP;
public class SWItem {
- private static Logger log = LoggerFactory.getLogger(SWItem.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(SWItem.class);
private static final ScheduledExecutorService eventWorker = Executors.newSingleThreadScheduledExecutor();
private static ScheduledFuture scheduledEventPost = null;
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.java
index 9243955f75..ea7699e0ab 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWPlugin.java
@@ -17,12 +17,13 @@ import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.events.EventConfigBuilderChange;
import info.nightscout.androidaps.interfaces.PluginBase;
import info.nightscout.androidaps.interfaces.PluginType;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.bus.RxBus;
import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.setupwizard.events.EventSWUpdate;
public class SWPlugin extends SWItem {
- private static Logger log = LoggerFactory.getLogger(SWPlugin.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(SWPlugin.class);
private PluginType pType;
private RadioGroup radioGroup;
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWRadioButton.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWRadioButton.java
index 00270384ec..091a6d8e99 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWRadioButton.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWRadioButton.java
@@ -12,10 +12,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.utils.SP;
public class SWRadioButton extends SWItem {
- private static Logger log = LoggerFactory.getLogger(SWRadioButton.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(SWRadioButton.class);
int labelsArray;
int valuesArray;
diff --git a/app/src/main/java/info/nightscout/androidaps/tabs/TabPageAdapter.java b/app/src/main/java/info/nightscout/androidaps/tabs/TabPageAdapter.java
index ae855cdfd5..9fee472cf0 100644
--- a/app/src/main/java/info/nightscout/androidaps/tabs/TabPageAdapter.java
+++ b/app/src/main/java/info/nightscout/androidaps/tabs/TabPageAdapter.java
@@ -15,6 +15,7 @@ import java.util.ArrayList;
import info.nightscout.androidaps.R;
import info.nightscout.androidaps.interfaces.PluginBase;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.utils.SP;
/**
@@ -26,7 +27,7 @@ public class TabPageAdapter extends FragmentPagerAdapter {
Context context;
- private static Logger log = LoggerFactory.getLogger(L.CORE);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.CORE);
public TabPageAdapter(FragmentManager fm, Context context) {
super(fm);
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/BatteryLevel.java b/app/src/main/java/info/nightscout/androidaps/utils/BatteryLevel.java
index bc000a95b9..b346125e6f 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/BatteryLevel.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/BatteryLevel.java
@@ -8,13 +8,14 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
/**
* Created by mike on 20.02.2017.
*/
public class BatteryLevel {
- private static Logger log = LoggerFactory.getLogger(BatteryLevel.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(BatteryLevel.class);
static public int lastUploadedLevel = 0;
static public int getBatteryLevel() {
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/HardLimits.java b/app/src/main/java/info/nightscout/androidaps/utils/HardLimits.java
index 8b80c4c6fc..dc6bd585ba 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/HardLimits.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/HardLimits.java
@@ -5,6 +5,7 @@ import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
/**
@@ -12,7 +13,7 @@ import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
*/
public class HardLimits {
- private static Logger log = LoggerFactory.getLogger(HardLimits.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(HardLimits.class);
final static int CHILD = 0;
final static int TEENAGE = 1;
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/JSONFormatter.java b/app/src/main/java/info/nightscout/androidaps/utils/JSONFormatter.java
index 6205beee21..9b754ac47a 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/JSONFormatter.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/JSONFormatter.java
@@ -12,11 +12,13 @@ import org.slf4j.LoggerFactory;
import java.util.Iterator;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
+
/**
* Created by mike on 11.07.2016.
*/
public class JSONFormatter {
- private static Logger log = LoggerFactory.getLogger(JSONFormatter.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(JSONFormatter.class);
public static Spanned format(final String jsonString) {
final JsonVisitor visitor = new JsonVisitor(1, '\t');
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/NumberPicker.java b/app/src/main/java/info/nightscout/androidaps/utils/NumberPicker.java
index b91236ba25..7ffabaec82 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/NumberPicker.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/NumberPicker.java
@@ -25,13 +25,14 @@ import java.util.concurrent.TimeUnit;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
/**
* Created by mike on 28.06.2016.
*/
public class NumberPicker extends LinearLayout implements View.OnKeyListener,
View.OnTouchListener, View.OnClickListener {
- private static Logger log = LoggerFactory.getLogger(NumberPicker.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(NumberPicker.class);
public interface OnValueChangedListener {
void onValueChanged(double value);
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/NumberPickerVertical.java b/app/src/main/java/info/nightscout/androidaps/utils/NumberPickerVertical.java
index 3265280c48..cae1a3cde3 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/NumberPickerVertical.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/NumberPickerVertical.java
@@ -24,12 +24,13 @@ import java.util.concurrent.TimeUnit;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
/**
* Created by mike on 28.06.2016.
*/
public class NumberPickerVertical extends NumberPicker {
- private static Logger log = LoggerFactory.getLogger(NumberPickerVertical.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(NumberPickerVertical.class);
public NumberPickerVertical(Context context) {
super(context);
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/SafeParse.java b/app/src/main/java/info/nightscout/androidaps/utils/SafeParse.java
index 5ee2a66177..4e1ee5ceae 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/SafeParse.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/SafeParse.java
@@ -3,11 +3,13 @@ package info.nightscout.androidaps.utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
+
/**
* Created by mike on 23.06.2016.
*/
public class SafeParse {
- private static Logger log = LoggerFactory.getLogger(SafeParse.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(SafeParse.class);
public static Double stringToDouble(String input) {
Double result = 0d;
input = input.replace(",", ".");
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/SingleClickButton.java b/app/src/main/java/info/nightscout/androidaps/utils/SingleClickButton.java
index 74500ebdbc..4ca57f3ad4 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/SingleClickButton.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/SingleClickButton.java
@@ -10,12 +10,14 @@ import android.view.View;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
+
/**
* Created by mike on 22.12.2017.
*/
public class SingleClickButton extends androidx.appcompat.widget.AppCompatButton implements View.OnClickListener {
- private static Logger log = LoggerFactory.getLogger(SingleClickButton.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(SingleClickButton.class);
Context context;
OnClickListener listener = null;
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/SntpClient.java b/app/src/main/java/info/nightscout/androidaps/utils/SntpClient.java
index 60de82a93c..2c28d3e212 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/SntpClient.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/SntpClient.java
@@ -25,6 +25,7 @@ import java.net.DatagramSocket;
import java.net.InetAddress;
import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
/**
* {@hide}
@@ -39,7 +40,7 @@ import info.nightscout.androidaps.logging.L;
*
*/
public class SntpClient {
- private static Logger log = LoggerFactory.getLogger(L.CORE);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(L.CORE);
//private static final int REFERENCE_TIME_OFFSET = 16;
private static final int ORIGINATE_TIME_OFFSET = 24;
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java b/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java
index 0143377bb2..892f9b2667 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java
@@ -29,13 +29,14 @@ import java.util.List;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
/**
* Created by mike on 29.12.2016.
*/
public class TimeListEdit {
- private static Logger log = LoggerFactory.getLogger(TimeListEdit.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(TimeListEdit.class);
private final int ONEHOURINSECONDS = 60 * 60;
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.java b/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.java
index 4354ccd528..4dcf23529c 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.java
@@ -13,6 +13,7 @@ import java.util.List;
import info.nightscout.androidaps.Constants;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
import info.nightscout.androidaps.services.Intents;
@@ -21,7 +22,7 @@ import info.nightscout.androidaps.services.Intents;
*/
public class XdripCalibrations {
- private static Logger log = LoggerFactory.getLogger(XdripCalibrations.class);
+ private static Logger log = StacktraceLoggerWrapper.getLogger(XdripCalibrations.class);
public static void confirmAndSendCalibration(final Double bg, final Context parentContext) {
if (parentContext != null) {
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.java
index 6ceb3cc438..8795ffd68e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.java
@@ -31,7 +31,7 @@ public class MedtronicHistoryDataUTest {
MedtronicPumpHistoryDecoder decoder = new MedtronicPumpHistoryDecoder();
- // Logger LOGGER = LoggerFactory.getLogger(MedtronicHistoryDataUTest.class);
+ // Logger LOGGER = StacktraceLoggerWrapper.getLogger(MedtronicHistoryDataUTest.class);
//@Before
public void setup() {