ok this time for sure

Signed-off-by: fbt <fbt@fleshless.org>

mod/network

@@ -1,45 +1,41 @@
 # vim: ft=ruby
 
-class ModNetwork < ModBasic
-	@@mod_name = 'network'
-
+class Network < Worker
 	require 'open3'
 
-	def data_loop()
-		$panel_data[@@mod_name.to_sym] = "checking..."
+	def mainloop()
+		self.write "checking..."
 
 		while true do
-			$panel_data[@@mod_name.to_sym] = network_status.chomp
-			$queue << 1
+			self.write network_status
 			sleep(10)
 		end
 	end
 
 	def network_status
-		hosts = $config['mod']['network']['hosts']
+		hosts = @config['mod']['network']['hosts']
 
 		net_ok = 0
 		hosts.each do |h|
 			i,o,t = Open3.popen2("ping", "-c", "1", h)
-			i.close; o.close
 			t.join
 
-			net_ok += 1 if t.value
+			net_ok += 1 if t.value.exitstatus == 0
 		end
 
 		if net_ok == 0
 			status = "CRIT"
-			fg_colour = $config['mod']['network']['crit_colour']
+			fg_colour = @config['mod']['network']['crit_colour']
 		elsif net_ok < hosts.length
 			status = "WARN"
-			fg_colour = $config['mod']['network']['warn_colour']
+			fg_colour = @config['mod']['network']['warn_colour']
 		else
 			status = "ok"
-			fg_colour = $config['mod']['network']['ok_colour']
+			fg_colour = @config['mod']['network']['ok_colour']
 		end
 
 		return "%{F#{fg_colour}}#{status}%{F-}"
 	end
 end
 
-ModNetwork.new.mainloop()
+Modules.add("network", "Network")