self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-04-20 11:28:40 +02:00
Code Issues Releases Activity

Desktop: Added more logging info to sync target upgrade process

Browse Source
This commit is contained in:
Laurent Cozic 2020-08-29 19:12:02 +01:00
parent 797f4a9669
commit 11646d1c21
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ElectronClient/gui/Root_UpgradeSyncTarget.tsx
View File

@ -63,7 +63,7 @@ function useStyle() {
function useRestartOnDone(upgradeResult:SyncTargetUpgradeResult) { function useRestartOnDone(upgradeResult:SyncTargetUpgradeResult) {
useEffect(function() { useEffect(function() {
if (upgradeResult.done) { if (upgradeResult.done && !upgradeResult.error) {
bridge().restart(); bridge().restart();
} }
}, [upgradeResult.done]); }, [upgradeResult.done]);

7
ReactNativeClient/lib/services/synchronizer/gui/useSyncTargetUpgrade.ts
View File

@ -15,10 +15,14 @@ export default function useSyncTargetUpgrade():SyncTargetUpgradeResult {
}); });
async function upgradeSyncTarget() { async function upgradeSyncTarget() {
reg.logger().info('useSyncTargetUpgrade: Starting process...');
let error = null; let error = null;
try { try {
reg.logger().info('useSyncTargetUpgrade: Acquire synchronizer...');
const synchronizer = await reg.syncTarget().synchronizer(); const synchronizer = await reg.syncTarget().synchronizer();
reg.logger().info('useSyncTargetUpgrade: Create migration handler...');
const migrationHandler = new MigrationHandler( const migrationHandler = new MigrationHandler(
synchronizer.api(), synchronizer.api(),
synchronizer.lockHandler(), synchronizer.lockHandler(),
@ -26,11 +30,14 @@ export default function useSyncTargetUpgrade():SyncTargetUpgradeResult {
Setting.value('clientId') Setting.value('clientId')
); );
reg.logger().info('useSyncTargetUpgrade: Start upgrade...');
await migrationHandler.upgrade(); await migrationHandler.upgrade();
} catch (e) { } catch (e) {
error = e; error = e;
} }
reg.logger().info('useSyncTargetUpgrade: Error:', error);
if (!error) { if (!error) {
Setting.setValue('sync.upgradeState', Setting.SYNC_UPGRADE_STATE_IDLE); Setting.setValue('sync.upgradeState', Setting.SYNC_UPGRADE_STATE_IDLE);
await Setting.saveAll(); await Setting.saveAll();