Merge pull request #66 from pentium10/master

fix for #65
ptrofimov · Sep 8, 2014 · 923b2a0 · 923b2a0
2 parents 4d46de7 + b290b11
commit 923b2a0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/include.php b/lib/include.php
@@ -255,7 +255,10 @@ protected function deleteAllFromTube($state, $tube) {
             } while (!empty($job));
         } catch (Exception $e) {
             // there might be no jobs to peek at, and peekReady raises exception in this situation
-            echo $e->getMessage();
+            // skip not found exception
+            if (strpos($e->getMessage(), Pheanstalk_Response::RESPONSE_NOT_FOUND) === false) {
+                $this->_errors[] = $e->getMessage();
+            }
         }
     }
 

diff --git a/public/index.php b/public/index.php
@@ -1,11 +1,15 @@
 <?php
+
 /**
  * @link https://github.com/ptrofimov/beanstalk_console
  * @link http://kr.github.com/beanstalkd/
  * @author Petr Trofimov, Sergey Lysenko
  */
 error_reporting(E_ALL);
 ini_set('display_errors', true);
+if (ob_get_level()) {
+    ob_end_clean();
+}
 
 require_once '../lib/include.php';
 $console = new Console;
@@ -17,4 +21,4 @@
 extract($tplVars);
 ?>
 
-<?php require_once "../lib/tpl/{$_tplMain}.php"?>
+<?php require_once "../lib/tpl/{$_tplMain}.php" ?>