fix: GrowingEventManager 在 loadLocalServices 之前初始化将导致数据库创建失败，事件无法入库

growingio · Apr 6, 2022 · 5a0b314 · 5a0b314
1 parent abccc9c
commit 5a0b314
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 20 deletions.
diff --git a/GrowingAnalytics/GrowingTrackerCore/Event/GrowingEventManager.h b/GrowingAnalytics/GrowingTrackerCore/Event/GrowingEventManager.h
@@ -57,8 +57,8 @@
 
 + (_Nonnull instancetype)sharedInstance;
 
-/// 配置事件发送通道
-- (void)configChannels;
+/// 配置事件管理者
+- (void)configManager;
 
 /// 开启事件发送定时器
 - (void)startTimerSend;

diff --git a/GrowingAnalytics/GrowingTrackerCore/Event/GrowingEventManager.m b/GrowingAnalytics/GrowingTrackerCore/Event/GrowingEventManager.m
@@ -83,38 +83,35 @@ + (instancetype)sharedInstance {
 - (instancetype)init {
     if (self = [super init]) {
         _allInterceptor = [NSHashTable hashTableWithOptions:NSPointerFunctionsWeakMemory];
-        _packageNum = kGrowingMaxBatchSize;
-        // default is 10MB
-        _uploadLimitOfCellular = [GrowingConfigurationManager sharedInstance].trackConfiguration.cellularDataLimit * kGrowingUnit_MB;
-        [GrowingDispatchManager dispatchInGrowingThread:^{
-            self->_timingEventDB = [GrowingEventDatabase databaseWithPath:[GrowingFileStorage getTimingDatabasePath]];
-            self->_timingEventDB.autoFlushCount = kGrowingMaxDBCacheSize;
-
-            self->_realtimeEventDB = [GrowingEventDatabase databaseWithPath:[GrowingFileStorage getRealtimeDatabasePath]];
-
-            // clean expired event data
-            [self cleanExpiredData_unsafe];
-            // load eventQueue for the first time
-            [self reloadFromDB_unsafe];
-        }];
     }
     return self;
 }
 
-#pragma mark - Configure Channels
+#pragma mark - Configure Manager
 
-- (void)configChannels {
+- (void)configManager {
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         [GrowingDispatchManager dispatchInGrowingThread:^{
+            self->_packageNum = kGrowingMaxBatchSize;
+            // default is 10MB
+            self->_uploadLimitOfCellular = [GrowingConfigurationManager sharedInstance].trackConfiguration.cellularDataLimit * kGrowingUnit_MB;
+
+            self->_timingEventDB = [GrowingEventDatabase databaseWithPath:[GrowingFileStorage getTimingDatabasePath]];
+            self->_timingEventDB.autoFlushCount = kGrowingMaxDBCacheSize;
+            self->_realtimeEventDB = [GrowingEventDatabase databaseWithPath:[GrowingFileStorage getRealtimeDatabasePath]];
+            // clean expired event data
+            [self cleanExpiredData_unsafe];
+            // load eventQueue for the first time
+            [self reloadFromDB_unsafe];
+
             for (NSObject<GrowingEventInterceptor> *obj in self.allInterceptor) {
                 if ([obj respondsToSelector:@selector(growingEventManagerChannels:)]) {
                     [obj growingEventManagerChannels:[GrowingEventChannel eventChannels]];
                 }
             }
 
             self->_allEventChannels = [GrowingEventChannel buildAllEventChannels];
-
             self->_eventChannelDict = [GrowingEventChannel eventChannelMapFromAllChannels:self->_allEventChannels];
             // all other events got to this category
             self->_otherEventChannel = [GrowingEventChannel otherEventChannelFromAllChannels:self->_allEventChannels];

diff --git a/GrowingAnalytics/GrowingTrackerCore/GrowingRealTracker.m b/GrowingAnalytics/GrowingTrackerCore/GrowingRealTracker.m
@@ -68,7 +68,7 @@ - (instancetype)initWithConfiguration:(GrowingTrackConfiguration *)configuration
         [[GrowingServiceManager sharedInstance] loadLocalServices];
         [[GrowingModuleManager sharedInstance] triggerEvent:GrowingMInitEvent];
         // 各个Module初始化init之后再进行事件定时发送
-        [[GrowingEventManager sharedInstance] configChannels];
+        [[GrowingEventManager sharedInstance] configManager];
         [[GrowingEventManager sharedInstance] startTimerSend];
         [self versionPrint];
         [self filterLogPrint];