Skip to content

Commit f9a327a

Browse files
nonelsenonelse
committed
Refac Loging parameters
1 parent 94939c3 commit f9a327a

File tree

8 files changed

+65
-68
lines changed

8 files changed

+65
-68
lines changed

‎Adjust/src/com/adjust/sdk/ActivityHandler.java‎

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import java.lang.ref.WeakReference;
2727
import java.util.HashMap;
2828
import java.util.List;
29-
import java.util.Locale;
3029
import java.util.Map;
3130
import java.util.concurrent.Executors;
3231
import java.util.concurrent.ScheduledExecutorService;
@@ -348,18 +347,16 @@ private void startInternal() {
348347
transferSessionPackage();
349348
activityState.resetSessionAttributes(now);
350349
writeActivityState();
351-
logger.debug(String.format(Locale.US,
352-
"Session %d", activityState.sessionCount));
350+
logger.debug("Session %d", activityState.sessionCount);
353351
return;
354352
}
355353

356354
// new subsession
357355
if (lastInterval > SUBSESSION_INTERVAL) {
358356
activityState.subsessionCount++;
359-
logger.info(String.format(Locale.US,
360-
"Started subsession %d of session %d",
361-
activityState.subsessionCount,
362-
activityState.sessionCount));
357+
logger.info("Started subsession %d of session %d",
358+
activityState.subsessionCount,
359+
activityState.sessionCount);
363360
}
364361
activityState.sessionLength += lastInterval;
365362
activityState.lastActivity = now;
@@ -397,13 +394,13 @@ private void trackEventInternal(PackageBuilder eventBuilder) {
397394
packageHandler.addPackage(eventPackage);
398395

399396
if (eventBuffering) {
400-
logger.info(String.format("Buffered event %s", eventPackage.getSuffix()));
397+
logger.info("Buffered event %s", eventPackage.getSuffix());
401398
} else {
402399
packageHandler.sendFirstPackage();
403400
}
404401

405402
writeActivityState();
406-
logger.debug(String.format(Locale.US, "Event %d", activityState.eventCount));
403+
logger.debug("Event %d", activityState.eventCount);
407404
}
408405

409406
private void trackRevenueInternal(PackageBuilder revenueBuilder) {
@@ -427,13 +424,13 @@ private void trackRevenueInternal(PackageBuilder revenueBuilder) {
427424
packageHandler.addPackage(eventPackage);
428425

429426
if (eventBuffering) {
430-
logger.info(String.format("Buffered revenue %s", eventPackage.getSuffix()));
427+
logger.info("Buffered revenue %s", eventPackage.getSuffix());
431428
} else {
432429
packageHandler.sendFirstPackage();
433430
}
434431

435432
writeActivityState();
436-
logger.debug(String.format(Locale.US, "Event %d (revenue)", activityState.eventCount));
433+
logger.debug("Event %d (revenue)", activityState.eventCount);
437434
}
438435

439436
private void readOpenUrlInternal(Uri url) {
@@ -476,7 +473,7 @@ private void readOpenUrlInternal(Uri url) {
476473
packageHandler.addPackage(reattributionPackage);
477474
packageHandler.sendFirstPackage();
478475

479-
logger.debug(String.format("Reattribution %s", adjustDeepLinks.toString()));
476+
logger.debug("Reattribution %s", adjustDeepLinks.toString());
480477
}
481478

482479
private void runDelegateMain(ResponseData responseData) {
@@ -499,11 +496,11 @@ private void launchDeepLinkMain(String deepLink) {
499496

500497
// Start an activity if it's safe
501498
if (!isIntentSafe) {
502-
logger.error(String.format("Unable to open deep link (%s)", deepLink));
499+
logger.error("Unable to open deep link (%s)", deepLink);
503500
return;
504501
}
505502

506-
logger.info(String.format("Open deep link (%s)", deepLink));
503+
logger.info("Open deep link (%s)", deepLink);
507504
context.startActivity(mapIntent);
508505
}
509506

@@ -549,7 +546,7 @@ private void readActivityState() {
549546

550547
try {
551548
activityState = (ActivityState) objectStream.readObject();
552-
logger.debug(String.format("Read activity state: %s uuid:%s", activityState, activityState.uuid));
549+
logger.debug("Read activity state: %s uuid:%s", activityState, activityState.uuid);
553550
return;
554551
} catch (ClassNotFoundException e) {
555552
logger.error("Failed to find activity state class");
@@ -566,7 +563,7 @@ private void readActivityState() {
566563
} catch (FileNotFoundException e) {
567564
logger.verbose("Activity state file not found");
568565
} catch (Exception e) {
569-
logger.error(String.format("Failed to open activity state file for reading (%s)", e));
566+
logger.error("Failed to open activity state file for reading (%s)", e);
570567
}
571568

572569
// start with a fresh activity state in case of any exception
@@ -581,15 +578,15 @@ private void writeActivityState() {
581578

582579
try {
583580
objectStream.writeObject(activityState);
584-
logger.debug(String.format("Wrote activity state: %s", activityState));
581+
logger.debug("Wrote activity state: %s", activityState);
585582
} catch (NotSerializableException e) {
586583
logger.error("Failed to serialize activity state");
587584
} finally {
588585
objectStream.close();
589586
}
590587

591588
} catch (Exception e) {
592-
logger.error(String.format("Failed to open activity state for writing (%s)", e));
589+
logger.error("Failed to open activity state for writing (%s)", e);
593590
}
594591
}
595592

@@ -625,7 +622,7 @@ private void injectReferrer(PackageBuilder builder) {
625622
builder.setReferrer(preferences.getString(ReferrerReceiver.REFERRER_KEY, null));
626623
}
627624
catch (Exception e) {
628-
logger.error(String.format("Failed to inject referrer (%s)", e));
625+
logger.error("Failed to inject referrer (%s)", e);
629626
}
630627
}
631628

@@ -706,7 +703,7 @@ private void setEnvironment(String env) {
706703
"PRODUCTION: Adjust is running in Production mode. Use this setting only for the build that you want to publish. Set the environment to `sandbox` if you want to test your app!");
707704
logger.setLogLevel(Logger.LogLevel.ASSERT);
708705
} else {
709-
logger.Assert(String.format("Malformed environment '%s'", environment));
706+
logger.Assert("Malformed environment '%s'", environment);
710707
logger.setLogLevel(Logger.LogLevel.ASSERT);
711708
environment = Constants.MALFORMED;
712709
}
@@ -722,7 +719,7 @@ private void setEventBuffering(boolean buffering) {
722719
private void setDefaultTracker(String tracker) {
723720
defaultTracker = tracker;
724721
if (defaultTracker != null) {
725-
logger.info(String.format("Default tracker: '%s'", defaultTracker));
722+
logger.info("Default tracker: '%s'", defaultTracker);
726723
}
727724
}
728725

@@ -742,7 +739,7 @@ private Bundle getApplicationBundle() {
742739
} catch (NameNotFoundException e) {
743740
logger.error("ApplicationInfo not found");
744741
} catch (Exception e) {
745-
logger.error(String.format("Failed to get ApplicationBundle (%s)", e));
742+
logger.error("Failed to get ApplicationBundle (%s)", e);
746743
}
747744
return null;
748745
}
@@ -778,7 +775,7 @@ private boolean checkAppTokenNotNull(String appToken) {
778775

779776
private boolean checkAppTokenLength(String appToken) {
780777
if (12 != appToken.length()) {
781-
logger.error(String.format("Malformed App Token '%s'", appToken));
778+
logger.error("Malformed App Token '%s'", appToken);
782779
return false;
783780
}
784781
return true;

‎Adjust/src/com/adjust/sdk/ActivityState.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ private void readObject(ObjectInputStream stream) throws NotActiveException, IOE
104104
// add new fields here
105105
} catch (Exception e) {
106106
Logger logger = AdjustFactory.getLogger();
107-
logger.debug(String.format("Unable to read new field in migration device with error (%s)",
108-
e.getMessage()));
107+
logger.debug("Unable to read new field in migration device with error (%s)",
108+
e.getMessage());
109109
}
110110

111111
// create UUID for migrating devices

‎Adjust/src/com/adjust/sdk/LogCatLogger.java‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99

1010
package com.adjust.sdk;
1111

12+
import static com.adjust.sdk.Constants.LOGTAG;
13+
1214
import java.util.Locale;
15+
1316
import android.util.Log;
14-
import static com.adjust.sdk.Constants.LOGTAG;
1517

1618
public class LogCatLogger implements Logger {
1719

@@ -32,48 +34,47 @@ public void setLogLevelString(String logLevelString) {
3234
try {
3335
setLogLevel(LogLevel.valueOf(logLevelString.toUpperCase(Locale.US)));
3436
} catch (IllegalArgumentException iae) {
35-
error(String.format("Malformed logLevel '%s', falling back to 'info'", logLevelString));
37+
error("Malformed logLevel '%s', falling back to 'info'", logLevelString);
3638
}
3739
}
3840
}
3941

4042
@Override
41-
public void verbose(String message) {
43+
public void verbose(String message, Object ...parameters) {
4244
if (logLevel.androidLogLevel <= Log.VERBOSE) {
43-
Log.v(LOGTAG, message);
45+
Log.v(LOGTAG, String.format(message, parameters));
4446
}
4547
}
4648

4749
@Override
48-
public void debug(String message) {
50+
public void debug(String message, Object ...parameters) {
4951
if (logLevel.androidLogLevel <= Log.DEBUG) {
50-
Log.d(LOGTAG, message);
52+
Log.d(LOGTAG, String.format(message, parameters));
5153
}
5254
}
5355

5456
@Override
55-
public void info(String message) {
57+
public void info(String message, Object ...parameters) {
5658
if (logLevel.androidLogLevel <= Log.INFO) {
57-
Log.i(LOGTAG, message);
59+
Log.i(LOGTAG, String.format(message, parameters));
5860
}
5961
}
6062

6163
@Override
62-
public void warn(String message) {
64+
public void warn(String message, Object ...parameters) {
6365
if (logLevel.androidLogLevel <= Log.WARN) {
64-
Log.w(LOGTAG, message);
66+
Log.w(LOGTAG, String.format(message, parameters));
6567
}
6668
}
6769

6870
@Override
69-
public void error(String message) {
71+
public void error(String message, Object ...parameters) {
7072
if (logLevel.androidLogLevel <= Log.ERROR) {
71-
Log.e(LOGTAG, message);
73+
Log.e(LOGTAG, String.format(message, parameters));
7274
}
7375
}
7476

7577
@Override
76-
public void Assert(String message) {
77-
Log.println(Log.ASSERT, LOGTAG, message);
78+
public void Assert(String message, Object ...parameters) {
7879
}
7980
}

‎Adjust/src/com/adjust/sdk/Logger.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ public int getAndroidLogLevel() {
2121

2222
public void setLogLevelString(String logLevelString);
2323

24-
public void verbose(String message);
24+
public void verbose(String message, Object ...parameters);
2525

26-
public void debug(String message);
26+
public void debug(String message, Object ...parameters);
2727

28-
public void info(String message);
28+
public void info(String message, Object ...parameters);
2929

30-
public void warn(String message);
30+
public void warn(String message, Object ...parameters);
3131

32-
public void error(String message);
32+
public void error(String message, Object ...parameters);
3333

34-
public void Assert(String message);
34+
public void Assert(String message, Object ...parameters);
3535

3636
}

‎Adjust/src/com/adjust/sdk/PackageBuilder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public boolean isValidForEvent() {
166166
public boolean isValidForRevenue() {
167167
if (amountInCents < 0.0) {
168168
Logger logger = AdjustFactory.getLogger();
169-
logger.error(String.format(Locale.US, "Invalid amount %f", amountInCents));
169+
logger.error("Invalid amount %f", amountInCents);
170170
return false;
171171
}
172172
if (eventToken == null) {
@@ -233,7 +233,7 @@ public ActivityPackage buildReattributionPackage() {
233233
private boolean isEventTokenValid() {
234234
if (6 != eventToken.length()) {
235235
Logger logger = AdjustFactory.getLogger();
236-
logger.error(String.format("Malformed Event Token '%s'", eventToken));
236+
logger.error("Malformed Event Token '%s'", eventToken);
237237
return false;
238238
}
239239
return true;

‎Adjust/src/com/adjust/sdk/PackageHandler.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.lang.ref.WeakReference;
2323
import java.util.ArrayList;
2424
import java.util.List;
25-
import java.util.Locale;
2625
import java.util.concurrent.atomic.AtomicBoolean;
2726

2827
import org.json.JSONObject;
@@ -191,7 +190,7 @@ private void initInternal() {
191190

192191
private void addInternal(ActivityPackage newPackage) {
193192
packageQueue.add(newPackage);
194-
logger.debug(String.format(Locale.US, "Added package %d (%s)", packageQueue.size(), newPackage));
193+
logger.debug("Added package %d (%s)", packageQueue.size(), newPackage);
195194
logger.verbose(newPackage.getExtendedString());
196195

197196
writePackageQueue();
@@ -237,7 +236,7 @@ private void readPackageQueue() {
237236
Object object = objectStream.readObject();
238237
@SuppressWarnings("unchecked")
239238
List<ActivityPackage> packageQueue = (List<ActivityPackage>) object;
240-
logger.debug(String.format(Locale.US, "Package handler read %d packages", packageQueue.size()));
239+
logger.debug("Package handler read %d packages", packageQueue.size());
241240
this.packageQueue = packageQueue;
242241
return;
243242
} catch (ClassNotFoundException e) {
@@ -278,14 +277,14 @@ private void writePackageQueue() {
278277

279278
try {
280279
objectStream.writeObject(packageQueue);
281-
logger.debug(String.format(Locale.US, "Package handler wrote %d packages", packageQueue.size()));
280+
logger.debug("Package handler wrote %d packages", packageQueue.size());
282281
} catch (NotSerializableException e) {
283282
logger.error("Failed to serialize packages");
284283
} finally {
285284
objectStream.close();
286285
}
287286
} catch (Exception e) {
288-
logger.error(String.format("Failed to write packages (%s)", e.getLocalizedMessage()));
287+
logger.error("Failed to write packages (%s)", e.getLocalizedMessage());
289288
e.printStackTrace();
290289
}
291290
}

‎Adjust/src/com/adjust/sdk/RequestHandler.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ private void requestFinished(HttpResponse response, ActivityPackage activityPack
139139
logger.info(activityPackage.getSuccessMessage());
140140
} else {
141141
// wrong status code
142-
logger.error(String.format("%s. (%s)", activityPackage.getFailureMessage(), responseData.getError()));
142+
logger.error("%s. (%s)", activityPackage.getFailureMessage(), responseData.getError());
143143
}
144144

145145
packageHandler.finishedTrackingActivity(activityPackage, responseData, jsonResponse);
@@ -153,7 +153,7 @@ private String parseResponse(HttpResponse response) {
153153
out.close();
154154
return out.toString().trim();
155155
} catch (Exception e) {
156-
logger.error(String.format("Failed to parse response (%s)", e));
156+
logger.error("Failed to parse response (%s)", e);
157157
return "Failed to parse response";
158158
}
159159
}
@@ -163,7 +163,7 @@ private void closePackage(ActivityPackage activityPackage, String message, Throw
163163
final String packageMessage = activityPackage.getFailureMessage();
164164
final String handlerMessage = packageHandler.getFailureMessage();
165165
final String reasonString = getReasonString(message, throwable);
166-
logger.error(String.format("%s. (%s) %s", packageMessage, reasonString, handlerMessage));
166+
logger.error("%s. (%s) %s", packageMessage, reasonString, handlerMessage);
167167

168168
ResponseData responseData = ResponseData.fromError(reasonString);
169169
responseData.setWillRetry(!packageHandler.dropsOfflineActivities());
@@ -175,7 +175,7 @@ private void closePackage(ActivityPackage activityPackage, String message, Throw
175175
private void sendNextPackage(ActivityPackage activityPackage, String message, Throwable throwable) {
176176
final String failureMessage = activityPackage.getFailureMessage();
177177
final String reasonString = getReasonString(message, throwable);
178-
logger.error(String.format("%s. (%s)", failureMessage, reasonString));
178+
logger.error("%s. (%s)", failureMessage, reasonString);
179179

180180
ResponseData responseData = ResponseData.fromError(reasonString);
181181
packageHandler.finishedTrackingActivity(activityPackage, responseData, null);

0 commit comments

Comments
 (0)