From 17b8020d2585ce248d12ad1a2b8f57a4ab250f82 Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Mon, 22 Feb 2010 23:30:05 -0500
Subject: clean up error logging

---
 plugins/OStatus/classes/Magicsig.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/plugins/OStatus/classes/Magicsig.php b/plugins/OStatus/classes/Magicsig.php
index 85664bbf9..c9f6182b5 100644
--- a/plugins/OStatus/classes/Magicsig.php
+++ b/plugins/OStatus/classes/Magicsig.php
@@ -89,7 +89,7 @@ class Magicsig extends Memcached_DataObject
 
         return parent::insert();
     }
-    
+
     public function generate($key_length = 512)
     {
         PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
@@ -143,15 +143,15 @@ class Magicsig extends Memcached_DataObject
         $params['public_key'] = new Crypt_RSA_KEY($mod, $exp, 'public');
         if ($params['public_key']->isError()) {
             $error = $params['public_key']->getLastError();
-            print $error->getMessage();
-            exit;
+            common_log(LOG_DEBUG, 'RSA Error: '. $error->getMessage());
+            return false;
         }
         if ($private_exp) {
             $params['private_key'] = new Crypt_RSA_KEY($mod, $private_exp, 'private');
             if ($params['private_key']->isError()) {
                 $error = $params['private_key']->getLastError();
-                print $error->getMessage();
-                exit;
+                common_log(LOG_DEBUG, 'RSA Error: '. $error->getMessage());
+                return false;
             }
         }
 
@@ -182,6 +182,7 @@ class Magicsig extends Memcached_DataObject
         if ($this->_rsa->isError()) {
             $error = $this->_rsa->getLastError();
             common_log(LOG_DEBUG, 'RSA Error: '. $error->getMessage());
+            return false;
         }
 
         return $sig;
@@ -192,8 +193,8 @@ class Magicsig extends Memcached_DataObject
         $result =  $this->_rsa->validateSign($signed_bytes, $signature, null, 'sha256');
         if ($this->_rsa->isError()) {
             $error = $this->keypair->getLastError();
-            //common_log(LOG_DEBUG, 'RSA Error: '. $error->getMessage());
-            print $error->getMessage();
+            common_log(LOG_DEBUG, 'RSA Error: '. $error->getMessage());
+            return false;
         }
         return $result;
     }
-- 
cgit v1.2.3-54-g00ecf