From: Ubuntu <ubuntu@disclosurelo.gs>
Date: Sat, 22 Sep 2012 12:43:01 +0000
Subject: Merge branch 'master' of ssh://apples.lambdacomplex.org/git/disclosr
X-Git-Url: https://maxious.lambdacomplex.org/git/?p=disclosr.git&a=commitdiff&h=5b4d553fbbe9fd24c7ebd06adf08a606df4c8740
---
Merge branch 'master' of ssh://apples.lambdacomplex.org/git/disclosr

Conflicts:
.gitmodules

Former-commit-id: 8fa59f84b31ddfef789f1f834f89323577d41fc2
---


--- a/.gitmodules
+++ b/.gitmodules
@@ -25,7 +25,7 @@
 [submodule "lib/querypath"]
 	path = lib/querypath
 	url = https://github.com/technosophos/querypath.git
-[submodule "sigma.js"]
-	path = sigma.js
-	url = https://github.com/jacomyal/sigma.js.git
+[submodule "lib/amon-php"]
+	path = lib/amon-php
+	url = https://github.com/martinrusev/amon-php.git
 

--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -14,6 +14,11 @@
 require_once $basePath.'lib/Requests/library/Requests.php';
 
 Requests::register_autoloader();
+require $basePath."/lib/amon-php/amon.php";
+Amon::config(array('address'=> 'http://127.0.0.1:2465', 
+		'protocol' => 'http', 
+		'secret_key' => "g99127n3lkzigg8ob2rllth97d1pb4sj"));
+Amon::setup_exception_handler();
 # Convert a stdClass to an Array. http://www.php.net/manual/en/language.types.object.php#102735
 
 function object_to_array(stdClass $Class) {

--- a/include/couchdb.inc.php
+++ b/include/couchdb.inc.php
@@ -168,6 +168,7 @@
 $server = new SetteeServer($serverAddr);
 
 function setteErrorHandler($e) {
+    Amon::log($e->getMessage() . " " . print_r($_SERVER,true), array('error'));
     echo $e->getMessage() . "<br>" . PHP_EOL;
 }
 

--- /dev/null
+++ b/lib/amon-php