SABnzbd Forums

Code: Select all

Nas:~# uname -a
Linux Nas 2.6.37.6.RNx86_64.2.1 #1 SMP Fri Jun 24 18:53:39 PDT 2011 x86_64 GNU/Linux
Nas:~# cat /proc/version
Linux version 2.6.37.6.RNx86_64.2.1 (jmaggard@calzone) (gcc version 4.1.2 20061115 (prerelease) (Debian 4.1.1-21)) #1 SMP Fri Jun 24 18:53:39 PDT 2011

Code: Select all

~/SABnzbd-0.6.6/sabnzbd$ diff -u misc.py.org misc.py

Code: Select all

--- misc.py.org	2011-07-31 12:02:54.667851903 +0200
+++ misc.py	2011-07-31 10:47:41.777851056 +0200
@@ -913,7 +913,36 @@
     if sabnzbd.WIN32 or sabnzbd.DARWIN:
         return ""
     try:
-        return "%.2f | %.2f | %.2f" % os.getloadavg()
+
+	'''
+	$ top -bn1 | grep Cpu
+	Cpu(s):  6.5%us,  1.7%sy,  0.9%ni, 89.8%id,  0.8%wa,  0.0%hi,  0.3%si,  0.0%st
+	'''
+	command = " top -bn1 | grep Cpu | awk '{ print $2 }' | awk -F% '{ print $1 }' "
+	CPUusage = os.popen(command).readline().strip()
+	#print CPUusage
+
+	'''
+	$ top -bn1 | grep SABnzbd.py
+	12665 sander    20   0  485m  74m 4568 S    0  2.0   0:28.02 SABnzbd.py      
+
+
+	with:
+	  PID USER      PR  NI  VIRT  RES  SHR S %CPU %MEM    TIME+  COMMAND      
+
+	'''
+	command = " top -bn1 | grep SABnzbd.py | awk '{ print $9 }' "
+	SABpercentage = os.popen(command).readline().strip()
+	#print SABpercentage
+
+	loadavg = "%.2f | %.2f | %.2f " % os.getloadavg()
+	#print loadavg
+
+	returnstring = loadavg + " --- CPUusage: " + CPUusage + "% --- SABpercentage: " + SABpercentage + "%"
+	#print returnstring
+
+        #return "%.2f | %.2f | %.2f | %s | %s" % os.getloadavg()
+	return returnstring
     except:
         return ""
 

Code: Select all

--- misc.py.org	2011-07-31 12:02:54.667851903 +0200
+++ misc.py	2011-07-31 12:20:36.957852103 +0200
@@ -912,10 +912,27 @@
     """
     if sabnzbd.WIN32 or sabnzbd.DARWIN:
         return ""
+
     try:
-        return "%.2f | %.2f | %.2f" % os.getloadavg()
+	dir = '/home/sander/SABnzbd-0.6.6'
+	#dir = '..'   #### Does not work :-( What is my working directory? Or: put the script in the pre/post-processing directory?
+	scriptname = 'sysload-custom-script.sh'
+	scriptfullname = dir + '/' + scriptname
+
+	if os.path.isfile(scriptfullname):
+		# print "Yes, file exists"
+		customoutput = ''
+		for thisline in os.popen(scriptfullname).readlines() :
+			customoutput += ' --- ' + thisline.strip()
+	else:
+		customoutput = '--- no script found ' + scriptfullname	# This is debug info
+
+	loadavg = "%.2f | %.2f | %.2f " % os.getloadavg()
+	returnstring = loadavg + customoutput
+	return returnstring
+
     except:
-        return ""
+        return "<something went wrong>"		# This is debug info too
 
 
 def format_time_string(seconds, days=0):

Code: Select all

sander@R540:~/SABnzbd-0.6.6$ ./sysload-custom-script.sh
CPUload: 6.1%
SABpercentage: 8%
sander@R540:~/SABnzbd-0.6.6$

Code: Select all

#!/bin/sh
top -bn1 | grep Cpu | awk '{ print $2 }' | awk -F% '{ print "CPUload: " $1 "%" }' 
top -bn1 | grep SABnzbd.py | awk '{ print "SABpercentage: " $9 "%" }'

Code: Select all

sander@R540:~/SABnzbd-0.6.6$ time ./sysload-custom-script.sh 
CPUload: 5.9%
SABpercentage: 4%

real	0m1.069s
user	0m0.020s
sys	0m0.040s
sander@R540:~/SABnzbd-0.6.6$

Code: Select all

'''
sander@R540:~/kul$ cat /proc/self/status | grep -i -e VmPeak -e VmRss
VmPeak:	    9236 kB
VmRSS:	     588 kB
sander@R540:~/kul$ 
'''

f = open('/proc/self/status', "r")
for myline in f.readlines():
	if(myline.strip().lower().find('vmpeak')>-1):
		print myline.split()[1]
f.close()

Code: Select all

--- misc.py.org	2011-07-31 12:02:54.667851903 +0200
+++ misc.py	2011-07-31 22:40:53.843213037 +0200
@@ -913,9 +913,15 @@
     if sabnzbd.WIN32 or sabnzbd.DARWIN:
         return ""
     try:
-        return "%.2f | %.2f | %.2f" % os.getloadavg()
+	f = open('/proc/self/status', "r")
+	for myline in f.readlines():
+		if(myline.strip().lower().find('vmpeak')>-1):
+			vmpeak = myline.split()[1]
+	f.close()
+	returnstring = "%.2f | %.2f | %.2f" % os.getloadavg() + ' --- ' + vmpeak + ' kB'
+	return returnstring
     except:
-        return ""
+        return "nope not good"
 
 
 def format_time_string(seconds, days=0):

Code: Select all

--- misc.py.org	2011-08-04 18:32:46.643345168 +0200
+++ misc.py	2011-08-04 18:44:06.043345297 +0200
@@ -912,10 +912,25 @@
     """
     if sabnzbd.WIN32 or sabnzbd.DARWIN:
         return ""
+
     try:
-        return "%.2f | %.2f | %.2f" % os.getloadavg()
+	scriptfullname = sabnzbd.DIR_PROG + '/' + 'sysload-custom-script.sh'	#### Or: put the script in the pre/post-processing directory?
+
+	if os.path.isfile(scriptfullname):
+		# print "Yes, file exists", scriptfullname
+		customoutput = ''
+		for thisline in os.popen(scriptfullname).readlines() :
+			customoutput += ' --- ' + thisline.strip()
+	else:
+		customoutput = '--- no script found '	# This is debug info
+
+	loadavg = "%.2f | %.2f | %.2f " % os.getloadavg()
+
+	returnstring = loadavg + customoutput + " --- END"
+	return returnstring
+
     except:
-        return ""
+        return "<something went wrong>"		# This is debug info too
 
 
 def format_time_string(seconds, days=0):

Code: Select all

sander@R540:~/SABnzbd-0.6.7RC1$ cat sysload-custom-script.sh 
#!/bin/sh
top -bn1 | grep Cpu | awk '{ print $2 }' | awk -F% '{ print "CPUload: " $1 "%" }' 
top -bn1 | grep SABnzbd.py | awk '{ print "SAB-CPU-percentage: " $9 "%" }'
echo -n "connections to port 8080 and 9090: "; netstat -na | grep -e :8080 -e :9090 | wc -l
echo -n "ping: "; ping -c5 -i0.2 ping.xs4all.nl | grep "packet loss"  | awk -F, '{ print $3 }'


sander@R540:~/SABnzbd-0.6.7RC1$ ./sysload-custom-script.sh 
CPUload: 4.4%
SAB-CPU-percentage: 2%
connections to port 8080 and 9090: 20
ping:  0% packet loss
sander@R540:~/SABnzbd-0.6.7RC1$