From Ted Ross, https://issues.apache.org/jira/browse/QPID-780

Implementation of --data-dir for qpidd.

Additions by myself:
 - set QPID_DATA_DIR= in test env so existing tests can run with no data dir.
 - src/Makefile.am and qpidc.spec.in install /var/lib/qpidd directory.

NOTE: qpidd with no optoins will now FAIL if it cannot write /var/lib/qpidd.
Start it with --data-dir= or set QPID_DATA_DIR= in your environement to
run with no data directory.



git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@619200 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 69 insertions, 0 deletions

diff --git a/cpp/src/qpid/DataDir.cpp b/cpp/src/qpid/DataDir.cpp
new file mode 100644
index 0000000000..baf536c109
--- /dev/null
+++ b/cpp/src/qpid/DataDir.cpp
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "Exception.h"
+#include "DataDir.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <cerrno>
+
+namespace qpid {
+
+DataDir::DataDir (std::string path) :
+    enabled (!path.empty ()),
+    dirPath (path)
+{
+    if (!enabled)
+        return;
+
+    const  char *cpath = dirPath.c_str ();
+    struct stat  s;
+
+    if (::stat (cpath, &s))
+        throw Exception ("Data directory not found: " + path);
+
+    std::string lockFile (path);
+    lockFile = lockFile + "/lock";
+    int fd = ::open (lockFile.c_str (), O_CREAT | O_EXCL,
+                     S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+    if (fd == -1)
+    {
+        if (errno == EEXIST)
+            throw Exception ("Data directory is locked by another process");
+        if (errno == EACCES)
+            throw Exception ("Insufficient privileges for data directory");
+
+        std::ostringstream oss;
+        oss << "Error locking data directory: errno=" << errno;
+        throw Exception (oss.str ());
+    }
+}
+
+DataDir::~DataDir ()
+{
+    std::string lockFile (dirPath);
+    lockFile = lockFile + "/lock";
+
+    ::unlink (lockFile.c_str ());
+}
+
+} // namespace qpid
+