tweaked some debug stuff and the error handler

1 files changed, 10 insertions, 5 deletions

diff --git a/lib/log.lib.php b/lib/log.lib.php
index 6c48945e..d8e68014 100644
--- a/lib/log.lib.php
+++ b/lib/log.lib.php
@@ -30,13 +30,14 @@ function log_event($username='Unknown',$event_name,$event_description,$log_name=
 	/* Set it up here to make sure it's _always_ the same */
         $log_time = time();
 
-	set_time_limit(0);
-
         $log_filename   = conf('log_path') . "/$log_name." . date("Ymd",$log_time) . ".log";
         $log_line       = date("Y-m-d H:i:s",$log_time) . " { $username } ( $event_name ) - $event_description \n";  
 
-
-	error_log($log_line, 3, $log_filename) or die("Error: Unable to write to log ($log_filename) Please check your log_path variable in ampache.cfg.php");
+	$log_write = error_log($log_line, 3, $log_filename);
+	
+	if (!$log_write) { 
+		echo "Error: Unable to write to log ($log_filename) Please check your log_path variable in ampache.cfg.php";
+	}
 
 } // log_event
 
@@ -47,6 +48,9 @@ function log_event($username='Unknown',$event_name,$event_description,$log_name=
 */
 function ampache_error_handler($errno, $errstr, $errfile, $errline) { 
 	
+	/* Default level of 1 */
+	$level = 1;
+	
 	switch ($errno) { 
 		case '2':
 			$error_name = "Runtime Error";
@@ -70,12 +74,13 @@ function ampache_error_handler($errno, $errstr, $errfile, $errline) {
 			break;
 		default:
 			$error_name = "Error";
+			$level = 2;
 			break;
 	} // end switch
 
 
 	$log_line = "[$error_name] $errstr on line $errline in $errfile";
-	log_event($_SESSION['userdata']['username'],'error',$log_line,'ampache-error');
+	debug_event('error',$log_line,$level);
 	
 } // ampache_error_handler