Browse Source

improve logs

Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
Jonas Mayer 1 year ago
parent
commit
4dedc25a06

+ 1 - 1
app/src/main/java/com/nextcloud/client/jobs/ContentObserverWork.kt

@@ -32,7 +32,7 @@ class ContentObserverWork(
         backgroundJobManager.logStartOfWorker(BackgroundJobManagerImpl.formatClassTag(this::class))
 
         if (params.triggeredContentUris.size > 0) {
-            Log_OC.d(TAG, "FILESYNC Content Observer detected files change")
+            Log_OC.d(TAG, "File-sync Content Observer detected files change")
             checkAndStartFileSyncJob()
             backgroundJobManager.startMediaFoldersDetectionJob()
         }

+ 4 - 4
app/src/main/java/com/nextcloud/client/jobs/FilesSyncWork.kt

@@ -94,7 +94,7 @@ class FilesSyncWork(
     @Suppress("MagicNumber")
     override fun doWork(): Result {
         backgroundJobManager.logStartOfWorker(BackgroundJobManagerImpl.formatClassTag(this::class))
-        Log_OC.d(TAG, "FILESYNC WORKER STARTED")
+        Log_OC.d(TAG, "File-sync worker started")
 
         val overridePowerSaving = inputData.getBoolean(OVERRIDE_POWER_SAVING, false)
         // If we are in power save mode, better to postpone upload
@@ -114,9 +114,9 @@ class FilesSyncWork(
 
         // Get changed files from ContentObserverWork (only images and videos) or by scanning filesystem
         val changedFiles = inputData.getStringArray(CHANGED_FILES)
-        Log_OC.d(TAG, "FILESYNC WORKER CHANGED FILES: " + changedFiles.contentToString())
+        Log_OC.d(TAG, "File-sync worker changed files from observer: " + changedFiles.contentToString())
         collectChangedFiles(changedFiles)
-        Log_OC.d(TAG, "FILESYNC WORKER CHECKED CHANGED FILES")
+        Log_OC.d(TAG, "File-sync worker finished checking files.")
 
         // Create all the providers we'll need
         val filesystemDataProvider = FilesystemDataProvider(contentResolver)
@@ -143,7 +143,7 @@ class FilesSyncWork(
                 )
             }
         }
-        Log_OC.d(TAG, "FILESYNC WORKER ENDED")
+        Log_OC.d(TAG, "File-sync worker finished")
         val result = Result.success()
         backgroundJobManager.logEndOfWorker(BackgroundJobManagerImpl.formatClassTag(this::class), result)
         return result

+ 5 - 6
app/src/main/java/com/owncloud/android/utils/FilesSyncHelper.java

@@ -119,6 +119,9 @@ public final class FilesSyncHelper {
             final long lastCheck = syncedFolder.getLastScanTimestampMs();
             final long thisCheck = System.currentTimeMillis();
 
+            Log_OC.d(TAG,"File-sync start check folder "+syncedFolder.getLocalPath());
+            long startTime = System.nanoTime();
+
             if (mediaType == MediaFolderType.IMAGE) {
                 FilesSyncHelper.insertContentIntoDB(MediaStore.Images.Media.INTERNAL_CONTENT_URI,
                                                     syncedFolder,
@@ -136,18 +139,15 @@ public final class FilesSyncHelper {
             } else {
                     FilesystemDataProvider filesystemDataProvider = new FilesystemDataProvider(contentResolver);
                     Path path = Paths.get(syncedFolder.getLocalPath());
-
-                    long startTime = System.nanoTime();
                     FilesSyncHelper.insertCustomFolderIntoDB(path, syncedFolder, filesystemDataProvider, lastCheck, thisCheck);
-                    Log_OC.d(TAG,"FILESYNC FINISHED LONG CHECK FOLDER "+path+" "+(System.nanoTime() - startTime));
-
             }
+
+            Log_OC.d(TAG,"File-sync finished full check for custom folder "+syncedFolder.getLocalPath()+" within "+(System.nanoTime() - startTime)+ "ns");
         }
     }
 
     public static void insertAllDBEntries(SyncedFolderProvider syncedFolderProvider) {
         for (SyncedFolder syncedFolder : syncedFolderProvider.getSyncedFolders()) {
-            Log_OC.d(TAG,"FILESYNC CHECK FOLDER "+syncedFolder.getLocalPath());
             if (syncedFolder.isEnabled()) {
                 insertAllDBEntriesForSyncedFolder(syncedFolder);
             }
@@ -166,7 +166,6 @@ public final class FilesSyncHelper {
                     filesystemDataProvider.storeOrUpdateFileValue(changedFile,
                                                                   file.lastModified(),file.isDirectory(),
                                                                   syncedFolder);
-                    Log_OC.d(TAG,"FILESYNC ADDED UPLOAD TO DB");
                     break;
                 }
             }