Merge pull request #40 from optimizely/logs

jophde · web-flow · commit 5f55ece31c37 · 2016-10-27T01:21:14.000-07:00
Tweaks logs
diff --git a/android-sdk/src/androidTest/java/com/optimizely/ab/android/sdk/OptimizelyManagerTest.java b/android-sdk/src/androidTest/java/com/optimizely/ab/android/sdk/OptimizelyManagerTest.java
@@ -24,7 +24,7 @@
 import android.support.test.runner.AndroidJUnit4;
 
 import com.optimizely.ab.android.shared.ServiceScheduler;
-import com.optimizely.user_experiment_record.AndroidUserExperimentRecord;
+import com.optimizely.ab.android.user_experiment_record.AndroidUserExperimentRecord;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/android-sdk/src/main/java/com/optimizely/ab/android/sdk/OptimizelyManager.java b/android-sdk/src/main/java/com/optimizely/ab/android/sdk/OptimizelyManager.java
@@ -41,7 +41,7 @@
 import com.optimizely.ab.bucketing.UserExperimentRecord;
 import com.optimizely.ab.config.parser.ConfigParseException;
 import com.optimizely.ab.event.internal.payload.Event;
-import com.optimizely.user_experiment_record.AndroidUserExperimentRecord;
+import com.optimizely.ab.android.user_experiment_record.AndroidUserExperimentRecord;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/android-sdk/src/main/resources/android-logger.properties b/android-sdk/src/main/resources/android-logger.properties
@@ -8,18 +8,18 @@
 
 # Core
 logger.com.optimizely.ab.Optimizely=DEBUG:Optly.core
-#logger.com.optimizely.ab.annotations=DEBUG:Optly.annotations
-#logger.com.optimizely.ab.bucketing=DEBUG:Optly.bucketing
-#logger.com.optimizely.ab.config=DEBUG:Optly.config
-#logger.com.optimizely.ab.error=DEBUG:Optly.error
-#logger.com.optimizely.ab.event=DEBUG:Optly.event
-#logger.com.optimizely.ab.internal=DEBUG:Optly.internal
+logger.com.optimizely.ab.annotations=DEBUG:Optly.annotations
+logger.com.optimizely.ab.bucketing=DEBUG:Optly.bucketing
+logger.com.optimizely.ab.config=DEBUG:Optly.config
+logger.com.optimizely.ab.error=DEBUG:Optly.error
+logger.com.optimizely.ab.event=DEBUG:Optly.event
+logger.com.optimizely.ab.internal=DEBUG:Optly.internal
 
 # Android
 logger.com.optimizely.ab.android.sdk=DEBUG:Optly.androidSdk
 logger.com.optimizely.ab.android.event_handler=DEBUG:Optly.eventHandler
 logger.com.optimizely.ab.android.shared=DEBUG:Optly.shared
-logger.com.optimizely.ab.android.user-experiment-record=DEBUG:Optly.userExperimentRec
+logger.com.optimizely.ab.android.user_experiment_record=DEBUG:Optly.userExpRec
 
 # Disable most SDK logs by commenting all other lines and uncommenting below
 #logger.com.optimizely.ab=ASSERT:Optly
diff --git a/android-sdk/src/test/java/com/optimizely/ab/android/sdk/OptimizelyManagerDataFileServiceConnectionTest.java b/android-sdk/src/test/java/com/optimizely/ab/android/sdk/OptimizelyManagerDataFileServiceConnectionTest.java
@@ -20,7 +20,7 @@
 import android.support.annotation.RequiresApi;
 
 import com.optimizely.ab.android.shared.ServiceScheduler;
-import com.optimizely.user_experiment_record.AndroidUserExperimentRecord;
+import com.optimizely.ab.android.user_experiment_record.AndroidUserExperimentRecord;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/event-handler/src/main/java/com/optimizely/ab/android/event_handler/EventIntentService.java b/event-handler/src/main/java/com/optimizely/ab/android/event_handler/EventIntentService.java
@@ -84,8 +84,8 @@ protected void onHandleIntent(Intent intent) {
         }
 
         if (eventDispatcher != null) {
-            eventDispatcher.dispatch(intent);
             logger.info("Handled intent");
+            eventDispatcher.dispatch(intent);
         } else {
             logger.warn("Unable to create dependencies needed by intent handler");
         }
diff --git a/user-experiment-record/src/androidTest/java/com/optimizely/ab/android/user_experiment_record/AndroidUserExperimentRecordTest.java b/user-experiment-record/src/androidTest/java/com/optimizely/ab/android/user_experiment_record/AndroidUserExperimentRecordTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.optimizely.user_experiment_record;
+package com.optimizely.ab.android.user_experiment_record;
 
 import android.os.Build;
 import android.support.annotation.RequiresApi;
diff --git a/user-experiment-record/src/androidTest/java/com/optimizely/ab/android/user_experiment_record/UserExperimentRecordCacheTest.java b/user-experiment-record/src/androidTest/java/com/optimizely/ab/android/user_experiment_record/UserExperimentRecordCacheTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.optimizely.user_experiment_record;
+package com.optimizely.ab.android.user_experiment_record;
 
 import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
diff --git a/user-experiment-record/src/androidTest/java/com/optimizely/ab/android/user_experiment_record/WriteThroughCacheFactoryTest.java b/user-experiment-record/src/androidTest/java/com/optimizely/ab/android/user_experiment_record/WriteThroughCacheFactoryTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.optimizely.user_experiment_record;
+package com.optimizely.ab.android.user_experiment_record;
 
 import android.os.Build;
 import android.support.annotation.NonNull;
@@ -46,7 +46,7 @@
 import static org.mockito.Mockito.when;
 
 /**
- * Tests for {@link com.optimizely.user_experiment_record.AndroidUserExperimentRecord.WriteThroughCacheTaskFactory}
+ * Tests for {@link com.optimizely.ab.android.user_experiment_record.AndroidUserExperimentRecord.WriteThroughCacheTaskFactory}
  */
 @RunWith(AndroidJUnit4.class)
 public class WriteThroughCacheFactoryTest {
diff --git a/user-experiment-record/src/main/AndroidManifest.xml b/user-experiment-record/src/main/AndroidManifest.xml
@@ -1,3 +1,3 @@
-<manifest package="com.optimizely.user_experiment_record"
+<manifest package="com.optimizely.ab.android.user_experiment_record"
           xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>
diff --git a/user-experiment-record/src/main/java/com/optimizely/ab/android/user_experiment_record/AndroidUserExperimentRecord.java b/user-experiment-record/src/main/java/com/optimizely/ab/android/user_experiment_record/AndroidUserExperimentRecord.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.optimizely.user_experiment_record;
+package com.optimizely.ab.android.user_experiment_record;
 
 import android.content.Context;
 import android.os.AsyncTask;
diff --git a/user-experiment-record/src/main/java/com/optimizely/ab/android/user_experiment_record/UserExperimentRecordCache.java b/user-experiment-record/src/main/java/com/optimizely/ab/android/user_experiment_record/UserExperimentRecordCache.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.optimizely.user_experiment_record;
+package com.optimizely.ab.android.user_experiment_record;
 
 import android.support.annotation.NonNull;
 

Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,8 @@ protected void onHandleIntent(Intent intent) {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`if (eventDispatcher != null) {`
`87`		`- eventDispatcher.dispatch(intent);`
`88`	`87`	`logger.info("Handled intent");`
	`88`	`+ eventDispatcher.dispatch(intent);`
`89`	`89`	`} else {`
`90`	`90`	`logger.warn("Unable to create dependencies needed by intent handler");`
`91`	`91`	`}`