# This patch file was generated by NetBeans IDE
# It uses platform neutral UTF-8 encoding and \n newlines.
Index: expire.admin.inc
--- expire.admin.inc Base (BASE)
+++ expire.admin.inc Locally Modified (Based On LOCAL)
@@ -53,5 +53,19 @@
     '#description'   => t('Include the base URL in expire requests. Compatible with Domain Access'),
   );
 
+  $form['logging'] = array(
+    '#type'          => 'fieldset',
+    '#title'         => t('Expire logging'),
+  );
+  $form['logging']['expire_log_actions'] = array(
+    '#type'          => 'checkbox',
+    '#title'         => t('Log expire actions and number of pages flushed'),
+    '#default_value' => variable_get('expire_log_actions', EXPIRE_LOG_ACTIONS),
+  );
+  $form['logging']['expire_log_urls'] = array(
+    '#type'          => 'checkbox',
+    '#title'         => t('Log page URLs that will be flushed'),
+    '#default_value' => variable_get('expire_log_urls', EXPIRE_LOG_URLS),
+  );  
   return system_settings_form($form);
 }
Index: expire.drush.inc
--- expire.drush.inc Base (BASE)
+++ expire.drush.inc Locally Modified (Based On LOCAL)
@@ -66,11 +66,13 @@
   foreach ($modules as $module) {
     module_invoke($module, 'expire_cache', $full_urls);
   }
+  if (variable_get('expire_log_urls', EXPIRE_LOG_URLS)) {
   watchdog('expire', 'Output: !urls <br /> Modules Using hook_expire_cache(): !modules', array(
     '!urls' => expire_print_r($full_urls),
     '!modules' => expire_print_r($modules),
   ));
 }
+}
 
 /**
  * Callback for expire-path drush command.
Index: expire.module
--- expire.module Base (BASE)
+++ expire.module Locally Modified (Based On LOCAL)
@@ -11,6 +11,8 @@
 define('EXPIRE_FLUSH_CCK_REFERENCES', TRUE);
 define('EXPIRE_FLUSH_FRONT', TRUE);
 define('EXPIRE_INCLUDE_BASE_URL', TRUE);
+define('EXPIRE_LOG_ACTIONS', FALSE);
+define('EXPIRE_LOG_URLS', FALSE);
 
 /**
  * Implementation of hook_menu().
@@ -117,12 +119,14 @@
   if (in_array($op, $cases)) {
     $paths[] = 'user/' . $account->uid;
     $flushed = expire_cache_derivative($paths, $account);
-    watchdog('expire', 'User !uid was deleted resulting in !flushed pages being expired from the cache',  array(
+    if (variable_get('expire_log_actions', EXPIRE_LOG_ACTIONS)) {
+      watchdog('expire', 'User !uid was modified resulting in !flushed pages being expired from the cache',  array(
       '!uid' => $account->uid,
       '!flushed' => $flushed,
     ));
   }
 }
+}
 
 /**
  * Implementation of hook_votingapi_insert().
@@ -287,12 +291,14 @@
   // Flush array of paths
   if (!empty($paths)) {
     $flushed = expire_cache_derivative($paths, $node);
+    if (variable_get('expire_log_actions', EXPIRE_LOG_ACTIONS)) {
     watchdog('expire', 'Node !nid was flushed resulting in !flushed pages being expired from the cache',  array(
       '!nid' => $node->nid,
       '!flushed' => $flushed,
     ));
   }
 }
+}
 
 /**
  * Finds parent, siblings and children of the menu item. UGLY CODE...
@@ -464,11 +470,13 @@
   foreach ($modules as $module) {
     module_invoke($module, 'expire_cache', $urls);
   }
+  if (variable_get('expire_log_urls', EXPIRE_LOG_URLS)) {
   watchdog('expire', 'Input: !paths <br /> Output: !urls <br /> Modules Using hook_expire_cache(): !modules', array(
     '!paths' => expire_print_r($paths),
     '!urls' => expire_print_r($urls),
     '!modules' => expire_print_r($modules),
   ));
+  }
   return count($urls);
 }
 
Index: expire.rules.inc
--- expire.rules.inc Base (BASE)
+++ expire.rules.inc Locally Modified (Based On LOCAL)
@@ -89,12 +89,13 @@
   foreach ($modules as $module) {
     module_invoke($module, 'expire_cache', $full_urls);
   }
+  if (variable_get('expire_log_urls', EXPIRE_LOG_URLS)) {
   watchdog('expire', 'Output: !urls <br /> Modules Using hook_expire_cache(): !modules', array(
     '!urls' => expire_print_r($full_urls),
     '!modules' => expire_print_r($modules),
   ));
-
 }
+}
 
 /**
  * Action clear page from cache configuration form.
