SIGSEGV Fixed

[vicar] / src / vicar-lib / cpp / logutility.h

diff --git a/src/vicar-lib/cpp/logutility.h b/src/vicar-lib/cpp/logutility.h
index ebca69e..5d1c255 100644 (file)
--- a/src/vicar-lib/cpp/logutility.h
+++ b/src/vicar-lib/cpp/logutility.h
@@ -1,56 +1,71 @@
 /*
-@version: 0.6
+@version: 0.4
 @author: Sudheer K. <scifi1947 at gmail.com>
 @license: GNU General Public License
 */
 
 #ifndef LOGUTILITY_H
 #define LOGUTILITY_H
+#include <QDebug>
 #include <QFile>
 #include <QIODevice>
-#include <QTextStream>
 #include <QDateTime>
-#include <QDebug>
+#include <QDir>
 
 class LogUtility : public QObject
 {
     Q_OBJECT
 
+private:
+    QFile * logFile;
+
 public:
-    LogUtility(QString logPath,QObject *parent = 0) :
+    LogUtility(QObject *parent = 0) :
         QObject(parent){
-        logFilePath = logPath;
+        QString strPath;
+
+#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+        //For maemo fremantle or harmattan use a common path                
+        QDir logDir = QDir(QDir().homePath() + "/.vicar");
+        if (!logDir.exists()){
+            if (QDir().mkpath(logDir.absolutePath())){
+                qDebug() << "Vicar: Log directory created successfully";
+            }
+            else{
+                qDebug() << "Vicar: Error creating log directory";
+            }
+        }
+        strPath = logDir.absolutePath() + "/vicar.log";
+#else
+        strPath = "vicar.log";
+#endif
+        logFile = new QFile(strPath,this);
+
+        if (!logFile->open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
+            qDebug() << "Vicar: Error opening logfile for writing at path " << strPath;
+        }
     }
 
     ~LogUtility(){
+        if (logFile->isOpen())
+            logFile->close();
+        qDebug() << "Vicar: In LogUtility object destructor..";
     }
 
 public slots:
-    void logMessage(QString strMessage, bool appendMode = true) {
-
-        QFile logFile(logFilePath);
-
-        bool success = false;
-
-        if (appendMode){
-            success = logFile.open(QIODevice::Append | QIODevice::WriteOnly | QIODevice::Text);
-        }
-        else{
-            success = logFile.open(QIODevice::Truncate | QIODevice::WriteOnly | QIODevice::Text);
-        }
+    void logMessage(QString strMessage) {
 
         QString strTimeNow = QDateTime::currentDateTime().toString("dd-MMM-yyyy HH:mm:ss");
-        if (success) {
-            QTextStream logStream(&logFile);
-            logStream <<  strTimeNow << " - " << strMessage << endl;
+
+        if (logFile->isOpen() && logFile->isWritable()) {
+            QTextStream logStream(logFile);
+            logStream <<  QString("[%1] - %2").arg(strTimeNow,strMessage) << endl;
+            qDebug() << QString("Vicar: [%1] - %2").arg(strTimeNow,strMessage);
         }
         else{
-            qDebug() <<  "ERROROPENINGLOGFILE" << " - " << strMessage;
+            qDebug() <<  "ERROROPENINGLOGFILE" << QString("Vicar: [%1] - %2").arg(strTimeNow,strMessage);
         }
     }
-
-private:
-    QString logFilePath;
 };
 
 #endif // LOGUTILITY_H