Commit Graph

11 Commits

Author SHA1 Message Date
Dan Ballard 568743ff3a threaded and locked the stats read and write 2012-04-07 17:37:15 -07:00
Dan Ballard 144390e546 remove accidently commited files 2012-04-07 17:06:13 -07:00
Dan Ballard 367941070a Merge branch 'master' of https://github.com/rhausch/System-Monitoring-Daemon 2012-04-07 17:05:37 -07:00
Robert Hausch aaad5f5837 Added Memory monitor 2012-04-07 17:04:36 -07:00
Dan Ballard 649b56390b Merge branch 'master' of https://github.com/rhausch/System-Monitoring-Daemon
Conflicts:
	monitor.py
2012-04-07 16:50:16 -07:00
Robert Hausch 2ec58e6d51 Added CPU usage 2012-04-07 16:47:30 -07:00
Dan Ballard 21f62fd994 stats locking 2012-04-07 16:43:54 -07:00
Dan Ballard e51a76116e basic server sits on port and listens and spits out canned json message 2012-04-07 16:01:28 -07:00
Robert Hausch 7d0c4922e0 Merge pull request #1 from dballard/master
license
2012-04-07 14:59:13 -07:00
Dan Ballard 6cce91d67e Adding GPL v3 License 2012-04-07 14:56:32 -07:00
Robert Hausch aba77ffa37 first commit 2012-04-07 14:47:27 -07:00