Просмотр исходного кода

Merge pull request #1596 from zertrin/1554-add-error-logging

Added some more error logging for database and filesystem store backends
El RIDO 1 год назад
Родитель
Сommit
c1050e08e8
3 измененных файлов с 8 добавлено и 0 удалено
  1. 1 0
      CHANGELOG.md
  2. 6 0
      lib/Data/Database.php
  3. 1 0
      lib/Data/Filesystem.php

+ 1 - 0
CHANGELOG.md

@@ -1,6 +1,7 @@
 # PrivateBin version history
 
 ## 2.0.0 (not yet released)
+* ADDED: Error logging in database and filesystem backend (#1554)
 * CHANGED: Remove page template (#265)
 * CHANGED: Jdenticons are now used as the default icons
 * CHANGED: Upgrading libraries to: jdenticon 2.0.0

+ 6 - 0
lib/Data/Database.php

@@ -188,6 +188,7 @@ class Database extends AbstractData
                 )
             );
         } catch (Exception $e) {
+            error_log('Error while attempting to insert a paste into the database: ' . $e->getMessage() . PHP_EOL);
             return false;
         }
     }
@@ -333,6 +334,7 @@ class Database extends AbstractData
                 )
             );
         } catch (Exception $e) {
+            error_log('Error while attempting to insert a comment into the database: ' . $e->getMessage() . PHP_EOL);
             return false;
         }
     }
@@ -915,8 +917,12 @@ class Database extends AbstractData
                 try {
                     $row                = $this->_select('SELECT sqlite_version() AS "v"', array(), true);
                     $supportsDropColumn = version_compare($row['v'], '3.35.0', '>=');
+                    if (!$supportsDropColumn) {
+                        error_log('Error: the available SQLite version (' . $row['v'] . ') does not support dropping columns. SQLite version 3.35.0 or later is necessary. The migration will not be fully complete, and you will need to delete the "postdate" column of the "paste" table yourself!');
+                    }
                 } catch (PDOException $e) {
                     $supportsDropColumn = false;
+                    error_log('Error while checking the SQLite version. The migration will not be fully complete, and you will need to delete the "postdate" column of the "paste" table yourself!');
                 }
             }
             if ($supportsDropColumn) {

+ 1 - 0
lib/Data/Filesystem.php

@@ -456,6 +456,7 @@ class Filesystem extends AbstractData
                 self::PROTECTION_LINE . PHP_EOL . Json::encode($data)
             );
         } catch (Exception $e) {
+            error_log('Error while trying to store data to the filesystem at path "' . $filename . '": ' . $e->getMessage() . PHP_EOL);
             return false;
         }
     }