]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/sysload.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

#308 fix
[etc/awesome.git] / widgets / sysload.lua
index 9472235e67d0d93d5541be48948639b76aef141a..df9dbea06bfeb265febeab5ba015cce3c15833c9 100644 (file)
@@ -9,10 +9,8 @@
 
 local helpers      = require("lain.helpers")
 local wibox        = require("wibox")
-
 local io           = { open = io.open }
 local string       = { match  = string.match }
-
 local setmetatable = setmetatable
 
 -- System load
@@ -20,38 +18,26 @@ local setmetatable = setmetatable
 local sysload = {}
 
 local function worker(args)
-    local args = args or {}
-    local timeout = args.timeout or 1
+    local args     = args or {}
+    local timeout  = args.timeout or 2
     local settings = args.settings or function() end
 
-    sysload.widget = wibox.widget.textbox('')
-    helpers.set_map("load_1", 0)
-    helpers.set_map("load_5", 0)
-    helpers.set_map("load_15", 0)
+    sysload.widget = wibox.widget.textbox()
 
-    function update()
+    function sysload.update()
         local f = io.open("/proc/loadavg")
         local ret = f:read("*all")
         f:close()
 
         load_1, load_5, load_15 = string.match(ret, "([^%s]+) ([^%s]+) ([^%s]+)")
 
-        if load_1 ~= helpers.get_map("load_1")
-           or load_5 ~= helpers.get_map("load_5")
-           or load_15 ~= helpers.get_map("load_15")
-        then
-            widget = sysload.widget
-            settings()
-
-            helpers.set_map("load_1", load_1)
-            helpers.set_map("load_5", load_5)
-            helpers.set_map("load_15", load_15)
-        end
+        widget = sysload.widget
+        settings()
     end
 
-    helpers.newtimer("sysload", timeout, update)
+    helpers.newtimer("sysload", timeout, sysload.update)
 
-    return sysload.widget
+    return sysload
 end
 
 return setmetatable(sysload, { __call = function(_, ...) return worker(...) end })