* IW_ERROR_INVALID_STATE errors wraped by verbose log messages

Softmotions · Feb 17, 2020 · e19a9f6 · e19a9f6
1 parent b2f7b00
commit e19a9f6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/ejdb2.c b/src/ejdb2.c
@@ -202,6 +202,7 @@ static iwrc _jb_coll_init(JBCOLL jbc, IWKV_val *meta) {
     RCRET(rc);
   }
   if (!jbc->meta) {
+    iwlog_error("Collection %s seems to be initialized", jbc->name);
     return IW_ERROR_INVALID_STATE;
   }
   rc = _jb_coll_load_meta_lr(jbc);
@@ -1694,6 +1695,7 @@ iwrc ejdb_close(EJDB *ejdbp) {
   }
   EJDB db = *ejdbp;
   if (!__sync_bool_compare_and_swap(&db->open, 1, 0)) {
+    iwlog_error2("Database is closed already");
     return IW_ERROR_INVALID_STATE;
   }
   iwrc rc = _jb_db_release(ejdbp);

diff --git a/src/ejdb2_internal.h b/src/ejdb2_internal.h
@@ -53,8 +53,11 @@ static_assert(JBNUMBUF_SIZE >= IWFTOA_BUFSIZE, "JBNUMBUF_SIZE >= IWFTOA_BUFSIZE"
 #define KEY_PREFIX_COLLMETA   "c." // Full key format: c.<coldbid>
 #define KEY_PREFIX_IDXMETA    "i." // Full key format: i.<coldbid>.<idxdbid>
 
-#define ENSURE_OPEN(db_) \
-  if (!(db_) || !((db_)->open)) return IW_ERROR_INVALID_STATE;
+#define ENSURE_OPEN(db_)                  \
+  if (!(db_) || !((db_)->open)) {         \
+    iwlog_error("Database is not open");  \
+    return IW_ERROR_INVALID_STATE;        \
+  }
 
 #define API_RLOCK(db_, rci_) \
   ENSURE_OPEN(db_);  \