Merge pull request #107 from OlegHahm/floor_smapi

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

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

-local io           = io
+local io           = { open = io.open }

 local string       = { format = string.format,
                        match  = string.match }
 
 local string       = { format = string.format,
                        match  = string.match }
 


@@ -28,19 +28,18 @@ local function worker(args)
 
     sysload.widget = wibox.widget.textbox('')
 
 
     sysload.widget = wibox.widget.textbox('')
 

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

         local f = io.open("/proc/loadavg")
         local f = io.open("/proc/loadavg")

-        local ret = f:read("*all")
+        local ret = f:read("*a")

         f:close()
         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