[Uludag-commits] r11926 - trunk/bocek/src

[svn-uludag at uludag.org.tr]

Author: gokmen.goksel
Date: Wed Jan 10 23:58:49 2007
New Revision: 11926

Added:
   trunk/bocek/src/mail.py
Modified:
   trunk/bocek/src/bocek.py
   trunk/bocek/src/consts.py
Log:
 * temizlik, mail yollayabil falan filan

Modified: trunk/bocek/src/bocek.py
=================================================================
--- trunk/bocek/src/bocek.py	(original)
+++ trunk/bocek/src/bocek.py	Wed Jan 10 23:58:49 2007
@@ -14,6 +14,7 @@
 import time
 import consts
 import subprocess
+import mail
 
 # GUI
 from gui import *
@@ -33,12 +34,6 @@
     about_data.addAuthor('Gökmen GÖKSEL', None, 'gokmen at pardus.org.tr')
     return about_data
 
-def arrayToStr(ar):
-    ret=''
-    for line in ar:
-        ret+=line
-    return ret
-
 class HelpDialog(QDialog):
     def __init__(self, parent=None):
         QDialog.__init__(self, parent)
@@ -58,6 +53,7 @@
         self.connect(self.buttonSave, SIGNAL('clicked()'), self.buildReport)
         self.connect(self.buttonHelp, SIGNAL('clicked()'), self.slotHelp)
         self.connect(guiApp, SIGNAL("shutDown()"), self.slotQuit)
+        os.environ["LC_ALL"] = "C"
 
     def slotQuit(self):
         self.deleteLater()
@@ -77,8 +73,16 @@
                     self.output+=self.getStaticOutput(log)
                 elif logs[log]==2:
                     self.output+=self.getCommandOutput(log)
-                self.output+="\n"#+("="*40)+"\n"
-        print self.writeReport()
+                self.output+="\n"
+        self.lastReportFile = self.writeReport()
+        if mail.send_mail(str(self.lineEmail.text()),
+                          ["gokmen at pardus.org.tr"],
+                          str(self.lineSummary.text()),
+                          str(self.lineDetails.text()),
+                          [self.lastReportFile]):
+            print "Message sent."
+        else:
+            print "Error on message sending"
 
     def writeReport(self):
         now = time.localtime()
@@ -89,14 +93,11 @@
         return filename
 
     def getStaticOutput(self,filename):
-        link = file(filename,'r')
-        lines = link.readlines()
-        link.close()
-        return arrayToStr(lines)
+        return file(filename,'r').read()
 
     def getCommandOutput(self,cmd):
         a = subprocess.Popen(cmd.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        return arrayToStr(a.communicate())
+        return "".join(a.communicate())
 
     def getCheckedLogs(self):
         ret=[]

Modified: trunk/bocek/src/consts.py
=================================================================
--- trunk/bocek/src/consts.py	(original)
+++ trunk/bocek/src/consts.py	Wed Jan 10 23:58:49 2007
@@ -14,7 +14,7 @@
                "/usr/bin/lsscsi -v"         :2,
                "/sbin/fdisk -l"             :2,
                "/usr/bin/df -h"             :2,
-               "/bin/service"               :2,
+               "/bin/service -N"            :2,
                "/sbin/muavin.py --debug"    :2,
                "/usr/bin/free"              :2}
 configFiles = {"/boot/grub/grub.conf"       :1,