From 2ec58e6d51c23c455b65bdfc9ce16bcd82bbd1e5 Mon Sep 17 00:00:00 2001
From: Robert Hausch <rob.hausch@gmail.com>
Date: Sat, 7 Apr 2012 16:47:30 -0700
Subject: [PATCH] Added CPU usage

---
 README     |  5 +++++
 monitor.py | 15 +++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/README b/README
index e69de29..4a574cb 100644
--- a/README
+++ b/README
@@ -0,0 +1,5 @@
+Authors: Dan Ballard & Robert Hausch
+
+Dependecies:
+  psutils 0.4.1 (PyPI)
+
diff --git a/monitor.py b/monitor.py
index c617a46..b8d5010 100755
--- a/monitor.py
+++ b/monitor.py
@@ -22,6 +22,8 @@
 
 from socket import *
 
+from sensors.cpu import *
+
 HOST = ''
 PORT = 6000
 ADDR = (HOST, PORT)
@@ -31,14 +33,23 @@ MAX_QUEUE = 5
 
 class Stats:
 	def __init__(self):
-		self.cpu_load = 50
+		self.sensors = []
+		self.sensors.append(cpu_monitor())
+
+	def getStats(self):
+		message = ''
+		for s in self.sensors:
+			s.update()
+			message += '{'+s.getFormatedData()+'}'
+		return message
+		
 
 class ClientHandler:
 	def __init__(self, stats):
 		self.stats = stats
 
 	def handle(self, sock):	
-		conn_sock.send('{ cpu_load: %d}' % (self.stats.cpu_load))
+		conn_sock.send( self.stats.getStats() )
 		conn_sock.close()
 
 stats = Stats()