delete: 删除container singleton

we7coreteam · Jun 11, 2021 · 679b323 · 679b323
1 parent 4f5771d
commit 679b323
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/Listener/AfterPipeMessageListener.php b/src/Listener/AfterPipeMessageListener.php
@@ -39,7 +39,7 @@ public function run(...$params) {
 			} catch (\Throwable $throwable) {
 				$message->result = $throwable->getMessage();
 				$this->getEventDispatcher()->dispatch(new AfterCronTaskExecutorEvent($message, $throwable));
-				$this->getContainer()->singleton(HandlerExceptions::class)->getHandler()->report($throwable);
+				$this->getContainer()->get(HandlerExceptions::class)->getHandler()->report($throwable);
 			}
 		}
 	}

diff --git a/src/Listener/AfterWorkerStartListener.php b/src/Listener/AfterWorkerStartListener.php
@@ -26,10 +26,10 @@ public function run(...$params) {
 			\isetProcessTitle(App::$server->getPname() . 'crontab dispatcher process');
 
 			if ((ENV & DEBUG) === DEBUG) {
-				$this->getContainer()->singleton(Output::class)->info('Crontab run at ' . date('Y-m-d H:i:s'));
+				$this->getContainer()->get(Output::class)->info('Crontab run at ' . date('Y-m-d H:i:s'));
 			}
 
-			$this->getContainer()->singleton('cron-task-scheduler')->schedule();
+			$this->getContainer()->get('cron-task-scheduler')->schedule();
 		} elseif ($workerId > Server::getDispatcherWorkerId() && $workerId <= Server::getMaxExecuteWorkerId()) {
 			\isetProcessTitle(App::$server->getPname() . 'crontab execute process');
 		}

diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -68,7 +68,7 @@ private function registerScheduler() {
 			 * @var SchedulerAbstract $scheduler
 			 */
 			$scheduler = $this->config->get('crontab.setting.scheduler', LoopScheduler::class);
-			$scheduler = new $scheduler($this->container->singleton('cron-task-manager'), $this->container->singleton('cron-task-strategy'));
+			$scheduler = new $scheduler($this->container->get('cron-task-manager'), $this->container->get('cron-task-strategy'));
 			$scheduler->setEventDispatcher($this->getEventDispatcher());
 
 			return $scheduler;