From 212e46c98d5ec2e0b996bfbbab5a7c8a6134b287 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Sun, 11 Nov 2007 09:16:35 +0000
Subject: * MUSIC: Fix some warning * MUSIC: Use same log format as HTTPD *
 MEDIALIB: Fix can't save media

---
 lib/XXV/MODULES/MUSIC.pm | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

(limited to 'lib')

diff --git a/lib/XXV/MODULES/MUSIC.pm b/lib/XXV/MODULES/MUSIC.pm
index 13906af..398ed12 100644
--- a/lib/XXV/MODULES/MUSIC.pm
+++ b/lib/XXV/MODULES/MUSIC.pm
@@ -279,10 +279,10 @@ sub _init {
         },
     );
 
-    # Look for table or create this table
-    my $version = main::getVersion;
-
     unless($obj->{mdbh}) {
+        # Look for table or create this table
+        my $version = main::getVersion;
+
         # don't remove old table, if updated rows => warn only
         tableUpdated($obj->{dbh},'MUSIC',12,0);
 
@@ -772,8 +772,7 @@ sub stream {
             $file = $obj->{path} . "/" . $file
                 if($obj->{mdbh});
 
-            debug sprintf('Stream file "%s" to client: %s',
-                $file,$client);
+            debug sprintf('Stream file "%s"',$file);
             my $erg = $obj->{ICE}->stream($file,0,$client)
                 || last;
         }
@@ -809,24 +808,23 @@ sub parseRequest {
     		}
     	}
 
-lg sprintf(qq|
------------------------------------------
-New Request from User: %s at Host: %s!
-Query: %s
------------------------------------------
-|, $data->{username}, $data->{HOST}, $data->{Query});
+    # Log like Apache Format ip, resolved hostname, user, method request, status, bytes, referer, useragent
+    lg sprintf('%s - %s "%s %s%s" %s %s "%s" "%s"',
+          getip($hdl),
+          $data->{username} ? $data->{username} : "-",
+          "GET", #$data->{Method},
+          $data->{Request} ? $data->{Request} : "",
+          $data->{Query} ? "?" . $data->{Query} : "",
+          "-", #$console->{'header'},
+          "-", #$console->{'sendbytes'},
+          $data->{Referer} ? $data->{Referer} : "-",
+          "-" #$data->{http_useragent} ? $data->{http_useragent} : ""
+        );
 
-        return $data;
+    return $data;
 	} else {
-
-error sprintf(qq|
------------------------------------------
-Unknown Request :
-%s
------------------------------------------
-|, join("\n", @$Req));
-
-		return;
+    error sprintf(" Unknown Request : %s", join("\n", @$Req));
+    return undef;
 	}
 }
 
-- 
cgit v1.2.3