Change default log level from 'info' to 'notice' and improve some of the log messages.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1204402 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 17 insertions, 14 deletions

diff --git a/sca-cpp/trunk/components/constdb/tinycdb.hpp b/sca-cpp/trunk/components/constdb/tinycdb.hpp
index 514133b0e1..02114cf1ae 100644
--- a/sca-cpp/trunk/components/constdb/tinycdb.hpp
+++ b/sca-cpp/trunk/components/constdb/tinycdb.hpp
@@ -157,13 +157,13 @@ const failable<int> cdbopen(TinyCDB& cdb) {
     struct stat st;
     const int s = stat(c_str(cdb.name), &st);
     if (s == -1)
-        return mkfailure<int>(string("Couldn't tinycdb read database stat ") + cdb.name);
+        return mkfailure<int>(string("Couldn't tinycdb read database stat: ") + cdb.name);
 
     // Open database for the first time
     if (cdb.fd == -1) {
         cdb.fd = open(c_str(cdb.name), O_RDONLY);
         if (cdb.fd == -1)
-            return mkfailure<int>(string("Couldn't open tinycdb database file ") + cdb.name);
+            return mkfailure<int>(string("Couldn't open tinycdb database file: ") + cdb.name);
         debug(cdb.fd, "tinycdb::open::fd");
         cdb.st = st;
         return cdb.fd;
@@ -178,7 +178,7 @@ const failable<int> cdbopen(TinyCDB& cdb) {
         // Reopen database
         const int newfd = open(c_str(cdb.name), O_RDONLY);
         if (newfd == -1)
-            return mkfailure<int>(string("Couldn't open tinycdb database file ") + cdb.name);
+            return mkfailure<int>(string("Couldn't open tinycdb database file: ") + cdb.name);
         if (newfd == cdb.fd) {
             debug(cdb.fd, "tinycdb::open::fd");
             cdb.st = st;
@@ -187,7 +187,7 @@ const failable<int> cdbopen(TinyCDB& cdb) {
 
         // We got a different fd, dup it to the current fd then close it
         if (fcntl(newfd, F_DUPFD, cdb.fd) == -1)
-            return mkfailure<int>(string("Couldn't dup tinycdb database file handle ") + cdb.name);
+            return mkfailure<int>(string("Couldn't dup tinycdb database file handle: ") + cdb.name);
         close(newfd);
 
         debug(cdb.fd, "tinycdb::open::fd");
@@ -228,9 +228,9 @@ const failable<bool> rewrite(const lambda<failable<bool>(buffer& buf, const unsi
     // Read the db header
     unsigned int pos = 0;
     if (lseek(fd, 0, SEEK_SET) != 0)
-        return mkfailure<bool>("Could not seek to tinycdb database start");
+        return mkfailure<bool>("Couldn't seek to tinycdb database start");
     if (::read(fd, buf, 2048) != 2048)
-        return mkfailure<bool>("Could not read tinycdb database header");
+        return mkfailure<bool>("Couldn't read tinycdb database header");
     pos += 2048;
     unsigned int eod = cdb_unpack(buf);
     debug(pos, "tinycdb::rewrite::eod");
@@ -267,7 +267,7 @@ const failable<bool> rewrite(const lambda<failable<bool>(buffer& buf, const unsi
 
         // Add the entry to the new db
         if (cdb_make_add(&cdbm, buf, klen, ((unsigned char*)buf)+klen, vlen) == -1)
-            return mkfailure<bool>("Could not add tinycdb entry");
+            return mkfailure<bool>("Couldn'tt add tinycdb entry");
     }
     if (pos != eod)
         return mkfailure<bool>("Invalid tinycdb database format");
@@ -279,7 +279,7 @@ const failable<bool> rewrite(const lambda<failable<bool>(buffer& buf, const unsi
 
     // Save the new db
     if (cdb_make_finish(&cdbm) == -1)
-        return mkfailure<bool>("Could not save tinycdb database");
+        return mkfailure<bool>("Couldn't save tinycdb database");
 
     return true;
 }
@@ -290,7 +290,7 @@ const failable<bool> rewrite(const lambda<failable<bool>(buffer& buf, const unsi
     string tmpname = dbname(cdb) + ".XXXXXX";
     int tmpfd = mkstemp(const_cast<char*>(c_str(tmpname)));
     if (tmpfd == -1)
-        return mkfailure<bool>("Could not create temporary tinycdb database");
+        return mkfailure<bool>("Couldn't create temporary tinycdb database");
 
     // Rewrite the db, apply the update function to each entry
     buffer buf = mkbuffer(2048);
@@ -303,7 +303,7 @@ const failable<bool> rewrite(const lambda<failable<bool>(buffer& buf, const unsi
 
     // Atomically replace the db and reopen it in read mode
     if (rename(c_str(tmpname), c_str(dbname(cdb))) == -1)
-        return mkfailure<bool>("Could not rename temporary tinycdb database");
+        return mkfailure<bool>("Couldn't rename temporary tinycdb database");
     cdbclose(cdb);
     failable<int> ffd = cdbopen(cdb);
     if (!hasContent(ffd))
@@ -333,7 +333,7 @@ struct postFinish {
     }
     const failable<bool> operator()(struct cdb_make& cdbm) const {
         if (cdb_make_add(&cdbm, c_str(ks), (unsigned int)length(ks), c_str(vs), (unsigned int)length(vs)) == -1)
-            return mkfailure<bool>("Could not add tinycdb entry");
+            return mkfailure<bool>(string("Couldn't add tinycdb entry: ") + ks);
         return true;
     }
 };
@@ -379,7 +379,7 @@ struct putFinish {
     }
     const failable<bool> operator()(struct cdb_make& cdbm) const {
         if (cdb_make_add(&cdbm, c_str(ks), (unsigned int)length(ks), c_str(vs), (unsigned int)length(vs)) == -1)
-            return mkfailure<bool>("Could not add tinycdb entry");
+            return mkfailure<bool>(string("Couldn't add tinycdb entry: ") + ks);
         return true;
     }
 };
@@ -419,8 +419,11 @@ const failable<value> get(const value& key, TinyCDB& cdb) {
     const string ks(scheme::writeValue(key));
 
     cdbi_t vlen;
-    if (cdb_seek(fd, c_str(ks), (unsigned int)length(ks), &vlen) <= 0)
-        return mkfailure<value>("Could not get tinycdb entry");
+    if (cdb_seek(fd, c_str(ks), (unsigned int)length(ks), &vlen) <= 0) {
+        ostringstream os;
+        os << "Couldn't get tinycdb entry: " << key;
+        return mkfailure<value>(str(os));
+    }
     char* data = gc_cnew(vlen + 1);
     cdb_bread(fd, data, vlen);
     data[vlen] = '\0';