battery: safety checks; #208

[etc/awesome.git] / widgets / sysload.lua

diff --git a/widgets/sysload.lua b/widgets/sysload.lua
index 90bdedfbcde5149e82d3c18c3dbd85bf2160ef0d..d8e4713a77371088c2ac14693b1183b97ef4517a 100644 (file)
--- a/widgets/sysload.lua
+++ b/widgets/sysload.lua
@@ -11,9 +11,8 @@ local newtimer     = require("lain.helpers").newtimer
 
 local wibox        = require("wibox")
 
 
 local wibox        = require("wibox")
 

-local io           = io
-local string       = { format = string.format,
-                       match  = string.match }
+local io           = { open = io.open }
+local string       = { match  = string.match }

 
 local setmetatable = setmetatable
 
 
 local setmetatable = setmetatable
 


@@ -23,24 +22,23 @@ local sysload = {}
 
 local function worker(args)
     local args = args or {}
 
 local function worker(args)
     local args = args or {}

-    local timeout = args.timeout or 5
+    local timeout = args.timeout or 2

     local settings = args.settings or function() end
 
     sysload.widget = wibox.widget.textbox('')
 
     local settings = args.settings or function() end
 
     sysload.widget = wibox.widget.textbox('')
 

-    function sysload.update()
+    function update()

         local f = io.open("/proc/loadavg")
         local ret = f:read("*all")
         f:close()
         local f = io.open("/proc/loadavg")
         local ret = f:read("*all")
         f:close()

-        
-        a, b, c = string.match(ret, "([^%s]+) ([^%s]+) ([^%s]+)")
+
+        load_1, load_5, load_15 = string.match(ret, "([^%s]+) ([^%s]+) ([^%s]+)")

 
         widget = sysload.widget
         settings()
     end
 
 
         widget = sysload.widget
         settings()
     end
 

-    newtimer("sysload", timeout, sysload.update)
-
+    newtimer("sysload", timeout, update)

     return sysload.widget
 end
 
     return sysload.widget
 end