From 7d468475c0376fb5a452136d4703f894e64d110d Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Mon, 19 May 2014 18:17:05 +1000
Subject: [PATCH] Better logging

---
 modules/cms/classes/CmsObject.php        | 2 +-
 modules/cms/classes/Controller.php       | 2 --
 modules/system/classes/UpdateManager.php | 8 +++++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/cms/classes/CmsObject.php b/modules/cms/classes/CmsObject.php
index 80113eedf..7e9dd4aba 100644
--- a/modules/cms/classes/CmsObject.php
+++ b/modules/cms/classes/CmsObject.php
@@ -327,7 +327,7 @@ class CmsObject
                 throw new ApplicationException(Lang::get('cms::lang.cms_object.error_creating_directory', ['name'=>$dirPath]));
         }
 
-        if (@file_put_contents($fullPath, $this->content) === false)
+        if (@File::put($fullPath, $this->content) === false)
             throw new ApplicationException(Lang::get('cms::lang.cms_object.error_saving', ['name'=>$this->fileName]));
 
         if (strlen($this->originalFileName) && $this->originalFileName !== $this->fileName) {
diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php
index 72e50376b..c68aabb8c 100644
--- a/modules/cms/classes/Controller.php
+++ b/modules/cms/classes/Controller.php
@@ -2,7 +2,6 @@
 
 use URL;
 use App;
-use Log;
 use File;
 use View;
 use Lang;
@@ -329,7 +328,6 @@ class Controller extends BaseController
                 return Response::make($responseContents, 406);
              }
             catch (Exception $ex) {
-                Log::error($ex);
                 return Response::make($ex->getMessage(), 500);
             }
         }
diff --git a/modules/system/classes/UpdateManager.php b/modules/system/classes/UpdateManager.php
index 3ac8931bb..0cbdd5122 100644
--- a/modules/system/classes/UpdateManager.php
+++ b/modules/system/classes/UpdateManager.php
@@ -1,6 +1,7 @@
 <?php namespace System\Classes;
 
 use App;
+use Log;
 use URL;
 use Lang;
 use Http;
@@ -10,7 +11,6 @@ use Carbon\Carbon;
 use System\Models\Parameters;
 use System\Models\PluginVersion;
 use System\Console\CacheClear;
-use System\Classes\SystemException;
 use System\Classes\ApplicationException;
 use October\Rain\Filesystem\Zip;
 use Exception;
@@ -474,7 +474,8 @@ class UpdateManager
             });
         }
         catch (Exception $ex) {
-            throw new SystemException(Lang::get('system::lang.server.connect_error'));
+            Log::error($ex);
+            throw new ApplicationException(Lang::get('system::lang.server.connect_error'));
         }
 
         if ($result->code == 404)
@@ -522,7 +523,8 @@ class UpdateManager
             });
         }
         catch (Exception $ex) {
-            throw new SystemException(Lang::get('system::lang.server.connect_error'));
+            Log::error($ex);
+            throw new ApplicationException(Lang::get('system::lang.server.connect_error'));
         }
 
         if ($result->code != 200)