avoid concurrent import jobs mess

Julien Veyssier · Julien Veyssier · commit e099fc899586 · 2021-04-19T16:05:09.000+02:00
Signed-off-by: Julien Veyssier &lt;eneiluj@posteo.net&gt;
diff --git a/lib/Service/DropboxStorageAPIService.php b/lib/Service/DropboxStorageAPIService.php
@@ -109,9 +109,11 @@ public function startImportDropbox(string $accessToken, string $userId): array {
 	public function importDropboxJob(string $userId): void {
 		$this->logger->error('Importing dropbox files for ' . $userId);
 		$importingDropbox = $this->config->getUserValue($userId, Application::APP_ID, 'importing_dropbox', '0') === '1';
-		if (!$importingDropbox) {
+		$jobRunning = $this->config->getUserValue($userId, Application::APP_ID, 'dropbox_import_running', '0') === '1';
+		if (!$importingDropbox || $jobRunning) {
 			return;
 		}
+		$this->config->setUserValue($userId, Application::APP_ID, 'dropbox_import_running', '1');
 
 		$accessToken = $this->config->getUserValue($userId, Application::APP_ID, 'token', '');
 		$refreshToken = $this->config->getUserValue($userId, Application::APP_ID, 'refresh_token', '');
@@ -140,6 +142,7 @@ public function importDropboxJob(string $userId): void {
 			$this->config->setUserValue($userId, Application::APP_ID, 'last_dropbox_import_timestamp', $ts);
 			$this->jobList->add(ImportDropboxJob::class, ['user_id' => $userId]);
 		}
+		$this->config->setUserValue($userId, Application::APP_ID, 'dropbox_import_running', '0');
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -109,9 +109,11 @@ public function startImportDropbox(string $accessToken, string $userId): array {`
`109`	`109`	`public function importDropboxJob(string $userId): void {`
`110`	`110`	`$this->logger->error('Importing dropbox files for ' . $userId);`
`111`	`111`	`$importingDropbox = $this->config->getUserValue($userId, Application::APP_ID, 'importing_dropbox', '0') === '1';`
`112`		`- if (!$importingDropbox) {`
	`112`	`+ $jobRunning = $this->config->getUserValue($userId, Application::APP_ID, 'dropbox_import_running', '0') === '1';`
	`113`	`+ if (!$importingDropbox \|\| $jobRunning) {`
`113`	`114`	`return;`
`114`	`115`	`}`
	`116`	`+ $this->config->setUserValue($userId, Application::APP_ID, 'dropbox_import_running', '1');`
`115`	`117`
`116`	`118`	`$accessToken = $this->config->getUserValue($userId, Application::APP_ID, 'token', '');`
`117`	`119`	`$refreshToken = $this->config->getUserValue($userId, Application::APP_ID, 'refresh_token', '');`
`@@ -140,6 +142,7 @@ public function importDropboxJob(string $userId): void {`
`140`	`142`	`$this->config->setUserValue($userId, Application::APP_ID, 'last_dropbox_import_timestamp', $ts);`
`141`	`143`	`$this->jobList->add(ImportDropboxJob::class, ['user_id' => $userId]);`
`142`	`144`	`}`
	`145`	`+ $this->config->setUserValue($userId, Application::APP_ID, 'dropbox_import_running', '0');`
`143`	`146`	`}`
`144`	`147`
`145`	`148`	`/**`