Merge lp:~stewart/drizzle/bug1001199 into lp:drizzle

[Stewart Smith]

query_log wasn't thread safe, fix that.

=== modified file 'plugin/query_log/file.cc'
--- plugin/query_log/file.cc	2011-09-18 20:03:12 +0000
+++ plugin/query_log/file.cc	2013-01-05 02:11:23 +0000
@@ -2,6 +2,7 @@
  *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
  *
  *  Copyright 2011 Daniel Nichter
+ *  Copyright 2013 Stewart Smith
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,13 +20,19 @@
 
 #include <config.h>
 #include "file.h"
+#include <sstream>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
 
 using namespace std;
 
 QueryLoggerFile::QueryLoggerFile()
 {
-  _fh.setf(ios::fixed, ios::floatfield);
-  _fh.precision(6);
+  _fd= -1;
 }
 
 QueryLoggerFile::~QueryLoggerFile()
@@ -35,48 +42,66 @@
 
 bool QueryLoggerFile::logEvent(const event_t *event)
 {
-  if (_fh.is_open())
+  ostringstream ss;
+  ss.setf(ios::fixed, ios::floatfield);
+  ss.precision(6);
+
+  if (_fd != -1)
   {
-    _fh << "# start_ts=" << event->ts
-        << "\n"
-        << "# session_id="     << event->session_id
-        <<  " query_id="       << event->query_id
-        <<  " rows_examined="  << event->rows_examined
-        <<  " rows_sent="      << event->rows_sent
-        <<  " tmp_tables="     << event->tmp_tables
-        <<  " warnings="       << event->warnings
-        << "\n"
-        << "# execution_time=" << event->execution_time
-        <<  " lock_time="      << event->lock_time
-        <<  " session_time="   << event->session_time
-        << "\n"
-        << "# error=" << event->error << "\n"
-        << "# schema=\"" << event->schema << "\"\n"
-        << event->query << ";\n#"
-        << endl;
+    ss << "# start_ts=" << event->ts
+       << "\n"
+       << "# session_id="     << event->session_id
+       <<  " query_id="       << event->query_id
+       <<  " rows_examined="  << event->rows_examined
+       <<  " rows_sent="      << event->rows_sent
+       <<  " tmp_tables="     << event->tmp_tables
+       <<  " warnings="       << event->warnings
+       << "\n"
+       << "# execution_time=" << event->execution_time
+       <<  " lock_time="      << event->lock_time
+       <<  " session_time="   << event->session_time
+       << "\n"
+       << "# error=" << event->error << "\n"
+       << "# schema=\"" << event->schema << "\"\n"
+       << event->query << ";\n#"
+       << endl;
+
+    string logmessage= ss.str();
+
+    ssize_t r= write(_fd, logmessage.c_str(), logmessage.length());
+    if (r != (ssize_t)logmessage.length())
+    {
+      fprintf(stderr, "query_log: Incomplete write() to log %d: %s\n",
+            errno, strerror(errno));
+      return true;
+    }
   }
-  return false; // success
+  return false;
 }
 
 bool QueryLoggerFile::openLogFile(const char *file)
 {
   closeLogFile();
 
-  _fh.open(file, ios::app);
-  if (_fh.fail())
-    return true; // error
+  _fd= open(file, O_CREAT|O_APPEND|O_WRONLY, 0600);
+  if (_fd == -1)
+  {
+    fprintf(stderr, "query_log: Unable to lopen log file %d: %s\n",
+            errno, strerror(errno));
+    return true;
+  }
 
-  return false; // success
+  return false;
 }
 
 bool QueryLoggerFile::closeLogFile()
 {
-  if (_fh.is_open())
+  if (_fd != -1)
   {
-    _fh.close();
-    if (_fh.fail())
-      return true;  // error
+    int r= close(_fd);
+    if (r == -1)
+      return true;
   }
 
-  return false;  // success
+  return false;
 }

=== modified file 'plugin/query_log/file.h'
--- plugin/query_log/file.h	2011-07-30 20:43:56 +0000
+++ plugin/query_log/file.h	2013-01-05 02:11:23 +0000
@@ -85,5 +85,5 @@
   bool closeLogFile();
 
 private:
-  std::ofstream _fh;  ///< File handle for open log file
+  int _fd;  ///< File handle for open log file
 };