Merge branch 'fix/folder' into feature/0611

@@ -333,13 +333,10 @@ class Command(BaseCommand, LoggerMixin):
                                                                                                traceback.format_exc()))
                                                                                                traceback.format_exc()))
                         failed_path = os.path.join(failed_output_dir, '{0}_{1}'.format(time.time(), name))
                         failed_path = os.path.join(failed_output_dir, '{0}_{1}'.format(time.time(), name))
                         shutil.move(path, failed_path)
                         shutil.move(path, failed_path)
-                    except PermissionError:
+                    except Exception as e:
                         os_error_filename_set.add(name)
                         os_error_filename_set.add(name)
-                        self.folder_log.error('{0} [permission error] [path={1}] [error={2}]'.format(
+                        self.folder_log.error('{0} [file move error] [path={1}] [error={2}]'.format(
                             self.log_base, path, traceback.format_exc()))
                             self.log_base, path, traceback.format_exc()))
-                    except Exception as e:
-                        self.folder_log.error('{0} [file error] [error={1}]'.format(
-                            self.log_base, traceback.format_exc()))
 
 
     def handle(self, *args, **kwargs):
     def handle(self, *args, **kwargs):
         process_list = []
         process_list = []