Merge branch 'master' of ssh://wwwjail.house/usr/local/git/base/kiosk

[kiosk.git] / recipe_renderer_and_trigger.py

diff --git a/recipe_renderer_and_trigger.py b/recipe_renderer_and_trigger.py
index 617b24109baa973fd98109dfb9ae8c8a745b2e39..9cf81b0e837297fc2acea2123f16353b2ab6890c 100644 (file)
--- a/recipe_renderer_and_trigger.py
+++ b/recipe_renderer_and_trigger.py
@@ -13,7 +13,7 @@ import renderer
 import trigger
 
 
-logger = logging.getLogger(__file__)
+logger = logging.getLogger(__name__)
 
 RECIPE_PAGE = "recipe-unwrapped_1_82400.html"
 RECIPE_PATH = os.path.join(constants.pages_dir, RECIPE_PAGE)
@@ -116,8 +116,10 @@ class RecipeRenderer(renderer.abstaining_renderer):
                     triggered = True
 
         if not triggered:
-            file_utils.remove(RECIPE_PAGE)
+            logger.debug("We are no longer triggered.")
+            if file_utils.does_path_exist(RECIPE_PATH):
+                file_utils.remove(RECIPE_PATH)
         else:
-            logger.debug("Signaling the trigger")
+            logger.debug("We are triggered.")
         globals.put("recipe_page_triggered", triggered)
         return True