apply feedback

doc/administration/pseudonymizer.md

@@ -22,7 +22,9 @@ To configure the pseudonymizer, you need to:
 
 - Provide a manifest file that describes which fields should be included or
   pseudonymized ([example `manifest.yml` file](https://gitlab.com/gitlab-org/gitlab-ee/tree/master/config/pseudonymizer.yml)).
-- Use an object storage
+  A default manifest is provided with the GitLab installation. Using a relative file path will be resolved from the Rails root. 
+  Alternatively, you can use an absolute file path.
+- Use an object storage and specify the connection parameters in the `pseudonymizer.upload.connection` configuration option. 
 
 **For Omnibus installations:**
 

ee/app/workers/pseudonymizer_worker.rb

@@ -3,8 +3,15 @@ class PseudonymizerWorker
   include CronjobQueue
 
   def perform
-    abort "The pseudonymizer is not available with this license." unless License.feature_available?(:pseudonymizer)
-    abort "The pseudonymizer is disabled." unless Gitlab::CurrentSettings.pseudonymizer_enabled?
+    unless License.feature_available?(:pseudonymizer)
+      Rails.logger.warn("The pseudonymizer is not available with this license.")
+      return
+    end
+
+    unless unless Gitlab::CurrentSettings.pseudonymizer_enabled?
+      Rails.logger.info("The pseudonymizer is disabled.")
+      return
+    end
 
     options = Pseudonymizer::Options.new(
       config: YAML.load_file(Gitlab.config.pseudonymizer.manifest),
@@ -14,7 +21,10 @@ class PseudonymizerWorker
     dumper = Pseudonymizer::Dumper.new(options)
     uploader = Pseudonymizer::Uploader.new(options, progress_output: File.open(File::NULL, "w"))
 
-    abort "The pseudonymizer object storage must be configured." unless uploader.available?
+    unless uploader.available?
+      Rails.logger.error("The pseudonymizer object storage must be configured.")
+      return
+    end
 
     begin
       dumper.tables_to_csv

ee/lib/pseudonymizer/dumper.rb

@@ -24,6 +24,7 @@ module Pseudonymizer
       @output_files = tables.map do |k, v|
         table_to_csv(k, v[:whitelist], v[:pseudo])
       end.compact
+
       schema_to_yml
       file_list_to_json