update

[l4.git] / l4 / pkg / ned / server / src / ned.lua

diff --git a/l4/pkg/ned/server/src/ned.lua b/l4/pkg/ned/server/src/ned.lua
index dc42f930dfe41cf477bccce5011e2a66d26e7cf6..170f72956df1c687aac654f12a9ce28d600fb43f 100644 (file)
--- a/l4/pkg/ned/server/src/ned.lua
+++ b/l4/pkg/ned/server/src/ned.lua
@@ -165,10 +165,12 @@ function App_env.new(proto)
   f.mem = f.mem or f.loader.mem;
 
   if type(f.log) == "table" then
-    f.log_tag, f.log_color = unpack(f.log);
+    f.log_args = f.log;
     f.log = nil;
   elseif type(f.log) == "function" then
     f.log = f.log()
+  else
+    f.log_args = {}
   end
 
   setmetatable(f, App_env);
@@ -183,9 +185,9 @@ end
 function App_env:log()
   Class.check(self, App_env);
   if self.loader.log_fab == nil or self.loader.log_fab.create == nil then
-    error ("Starting a application without valid log factory", 4);
+    error ("Starting an application without valid log factory", 4);
   end
-  return self.loader.log_fab:create(Proto.Log, self.log_tag, self.log_color);
+  return self.loader.log_fab:create(Proto.Log, unpack(self.log_args));
 end
 
 function App_env:start(...)
@@ -194,10 +196,10 @@ function App_env:start(...)
   local function fa(a)
     return string.gsub(a, ".*/", "");
   end
-  local old_log_tag = self.log_tag;
-  self.log_tag = self.log_tag or fa(...);
+  local old_log_tag = self.log_args[1];
+  self.log_args[1] = self.log_args[1] or fa(...);
   local res = exec(self, ...);
-  self.log_tag = old_log_tag;
+  self.log_args[1] = old_log_tag;
   return res;
 end