Bug 1146750 - Do not remove PI tmp directory when tidying

openshift · Oct 20, 2014 · 3499753 · 3499753
1 parent 65e2082
commit 3499753
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/node/lib/openshift-origin-node/model/application_container.rb b/node/lib/openshift-origin-node/model/application_container.rb
@@ -401,7 +401,7 @@ def tidy
           # git gc - do this last to maximize room  for git to write changes
           gear_level_tidy_git(gear_repo_dir)
         rescue Exception => e
-          logger.warn("An unknown exception occured during tidy for gear #{@uuid}: #{e.message}\n#{e.backtrace}")
+          logger.warn("An unknown exception occurred during tidy for gear #{@uuid}: #{e.message}\n#{e.backtrace}")
         ensure
           start_gear(user_initiated: false)
         end
@@ -515,7 +515,7 @@ def stop_gear(options={})
       def gear_level_tidy_tmp(gear_tmp_dir)
         # Temp dir cleanup
         tidy_action do
-          FileUtils.rm_rf(Dir.glob(PathUtils.join(gear_tmp_dir, "*")))
+          FileUtils.rm_rf(Dir.glob(PathUtils.join(gear_tmp_dir, uuid, '*')))
           logger.debug("Cleaned gear temp dir at #{gear_tmp_dir}")
         end
       end