Skip to content

Commit

Permalink
Update from RunOnFlux/flux@788862a
Browse files Browse the repository at this point in the history
  • Loading branch information
@RunOnFluxBot
RunOnFluxBot committed Nov 24, 2023
1 parent 3e15c55 commit ebdeed7
Showing 1 changed file with 41 additions and 14 deletions.
55 changes: 41 additions & 14 deletions services/appsService.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9985,39 +9985,52 @@ async function syncthingApps() {
paused: false,
type: folderSyncType,
};
const syncFolder = allFoldersResp.data.find((x) => x.id === id);
if (containerDataFlags.includes('r')) {
if (syncthingAppsFirstRun) {
log.info('SyncthingApps first run');
receiveOnlySyncthingAppsCache.set(appId, 6);
syncthingFolder.folderSyncType = 'sendreceive';
if (syncFolder.folderSyncType === 'receiveonly') {
// eslint-disable-next-line no-await-in-loop
const folderRevert = await syncthingService.dbRevert(id);
log.info(`Revert SyncthingApps app ${appId} result: ${JSON.stringify(folderRevert)}`);
syncthingFolder.paused = true;
// eslint-disable-next-line no-await-in-loop
await syncthingService.adjustConfigFolders('put', syncthingFolder, syncthingFolder.id); // systemResetFolder id requires the folder to be paused before execution
// eslint-disable-next-line no-await-in-loop
const folderReset = await syncthingService.systemResetFolderId(syncthingFolder.id);
log.info(`Reset SyncthingApps app ${appId} result: ${JSON.stringify(folderReset)}`);
syncthingFolder.folderSyncType = 'sendreceive';
}
} else if (receiveOnlySyncthingAppsCache.has(appId)) {
const numberOfRuns = receiveOnlySyncthingAppsCache.get(appId) + 1;
folderSyncType = 'receiveonly';
log.info(`SyncthingApps appIdentifier ${appId} execution number: ${numberOfRuns}`);
if (numberOfRuns === 4) {
if (numberOfRuns === 3) {
// eslint-disable-next-line no-await-in-loop
const folderRevert = await syncthingService.dbRevert(id);
log.info(`Revert SyncthingApps app ${appId} result: ${JSON.stringify(folderRevert)}`);
syncthingFolder.paused = true;
// eslint-disable-next-line no-await-in-loop
await syncthingService.adjustConfigFolders('put', syncthingFolder, syncthingFolder.id); // systemResetFolder id requires the folder to be paused before execution
// eslint-disable-next-line no-await-in-loop
const folderReset = await syncthingService.systemResetFolderId(syncthingFolder.id);
log.info(`Reset SyncthingApps app ${appId} result: ${JSON.stringify(folderReset)}`);
syncthingFolder.paused = false;
// eslint-disable-next-line no-await-in-loop
await syncthingService.adjustConfigFolders('put', syncthingFolder, syncthingFolder.id);
syncthingFolder.folderSyncType = 'sendreceive';
}
if (numberOfRuns >= 5) {
if (numberOfRuns > 3) {
syncthingFolder.folderSyncType = 'sendreceive';
}
receiveOnlySyncthingAppsCache.set(appId, numberOfRuns);
} else {
log.info(`SyncthingApps appIdentifier ${identifier} execution number: 1`);
log.info(`SyncthingApps appIdentifier ${appId} execution number: 1`);
syncthingFolder.folderSyncType = 'receiveonly';
receiveOnlySyncthingAppsCache.set(appId, 1);
}
}
folderIds.push(id);
foldersConfiguration.push(syncthingFolder);
const syncFolder = allFoldersResp.data.find((x) => x.id === id);
if (!syncFolder || syncFolder.paused || syncFolder.type !== folderSyncType) {
newFoldersConfiguration.push(syncthingFolder);
}
Expand Down Expand Up @@ -10079,39 +10092,53 @@ async function syncthingApps() {
paused: false,
type: folderSyncType,
};
const syncFolder = allFoldersResp.data.find((x) => x.id === id);
if (containerDataFlags.includes('r')) {
if (syncthingAppsFirstRun) {
log.info('SyncthingApps first run');
receiveOnlySyncthingAppsCache.set(appId, 6);
syncthingFolder.folderSyncType = 'sendreceive';
if (syncFolder.folderSyncType === 'receiveonly') {
// eslint-disable-next-line no-await-in-loop
const folderRevert = await syncthingService.dbRevert(id);
log.info(`Revert SyncthingApps app ${appId} result: ${JSON.stringify(folderRevert)}`);
syncthingFolder.paused = true;
// eslint-disable-next-line no-await-in-loop
await syncthingService.adjustConfigFolders('put', syncthingFolder, syncthingFolder.id); // systemResetFolder id requires the folder to be paused before execution
// eslint-disable-next-line no-await-in-loop
const folderReset = await syncthingService.systemResetFolderId(syncthingFolder.id);
log.info(`Reset SyncthingApps app ${appId} result: ${JSON.stringify(folderReset)}`);
syncthingFolder.paused = false;
syncthingFolder.folderSyncType = 'sendreceive';
}
} else if (receiveOnlySyncthingAppsCache.has(appId)) {
const numberOfRuns = receiveOnlySyncthingAppsCache.get(appId) + 1;
folderSyncType = 'receiveonly';
log.info(`SyncthingApps appIdentifier ${appId} execution number: ${numberOfRuns}`);
if (numberOfRuns === 4) {
if (numberOfRuns === 3) {
// eslint-disable-next-line no-await-in-loop
const folderRevert = await syncthingService.dbRevert(id);
log.info(`Revert SyncthingApps app ${appId} result: ${JSON.stringify(folderRevert)}`);
syncthingFolder.paused = true;
// eslint-disable-next-line no-await-in-loop
await syncthingService.adjustConfigFolders('put', syncthingFolder, syncthingFolder.id); // systemResetFolder id requires the folder to be paused before execution
// eslint-disable-next-line no-await-in-loop
const folderReset = await syncthingService.systemResetFolderId(syncthingFolder.id);
log.info(`Reset SyncthingApps app ${appId} result: ${JSON.stringify(folderReset)}`);
syncthingFolder.paused = false;
// eslint-disable-next-line no-await-in-loop
await syncthingService.adjustConfigFolders('put', syncthingFolder, syncthingFolder.id);
syncthingFolder.folderSyncType = 'sendreceive';
}
if (numberOfRuns >= 5) {
if (numberOfRuns > 3) {
syncthingFolder.folderSyncType = 'sendreceive';
}
receiveOnlySyncthingAppsCache.set(appId, numberOfRuns);
} else {
log.info(`SyncthingApps appIdentifier ${identifier} execution number: 1`);
log.info(`SyncthingApps appIdentifier ${appId} execution number: 1`);
syncthingFolder.folderSyncType = 'receiveonly';
receiveOnlySyncthingAppsCache.set(appId, 1);
}
}
folderIds.push(id);
foldersConfiguration.push(syncthingFolder);
const syncFolder = allFoldersResp.data.find((x) => x.id === id);
if (!syncFolder || syncFolder.paused || syncFolder.type !== folderSyncType) {
newFoldersConfiguration.push(syncthingFolder);
}
Expand Down

0 comments on commit ebdeed7

Please sign in to comment.