Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

improve error messages on startup

This commit is contained in:
Jan Steemann 2013-11-14 00:55:36 +01:00
parent d3f79dd700
commit 02a793f5ae
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/VocBase/server.c
View File

@ -821,7 +821,7 @@ static int OpenDatabases (TRI_server_t* server) {
// grab last error // grab last error
res = TRI_errno(); res = TRI_errno();
if (res != TRI_ERROR_NO_ERROR) { if (res == TRI_ERROR_NO_ERROR) {
// but we must have an error... // but we must have an error...
res = TRI_ERROR_INTERNAL; res = TRI_ERROR_INTERNAL;
} }

15
arangod/VocBase/vocbase.c
View File

@ -562,6 +562,9 @@ static TRI_vocbase_col_t* AddCollection (TRI_vocbase_t* vocbase,
if (found != NULL) { if (found != NULL) {
LOG_ERROR("duplicate entry for collection name '%s'", name); LOG_ERROR("duplicate entry for collection name '%s'", name);
LOG_ERROR("collection id %llu has same name as already added collection %llu",
(unsigned long long) cid,
(unsigned long long) ((TRI_vocbase_col_t*) found)->_cid);
TRI_Free(TRI_UNKNOWN_MEM_ZONE, collection); TRI_Free(TRI_UNKNOWN_MEM_ZONE, collection);
TRI_set_errno(TRI_ERROR_ARANGO_DUPLICATE_NAME); TRI_set_errno(TRI_ERROR_ARANGO_DUPLICATE_NAME);
@ -981,12 +984,6 @@ static int ScanPath (TRI_vocbase_t* vocbase,
c = AddCollection(vocbase, type, info._name, info._cid, file); c = AddCollection(vocbase, type, info._name, info._cid, file);
if (iterateMarkers) {
// iterating markers may be time-consuming. we'll only do it if
// we have to
TRI_IterateTicksCollection(file, StartupTickIterator, NULL);
}
if (c == NULL) { if (c == NULL) {
LOG_ERROR("failed to add document collection from '%s'", file); LOG_ERROR("failed to add document collection from '%s'", file);
@ -999,6 +996,12 @@ static int ScanPath (TRI_vocbase_t* vocbase,
} }
c->_status = TRI_VOC_COL_STATUS_UNLOADED; c->_status = TRI_VOC_COL_STATUS_UNLOADED;
if (iterateMarkers) {
// iterating markers may be time-consuming. we'll only do it if
// we have to
TRI_IterateTicksCollection(file, StartupTickIterator, NULL);
}
LOG_DEBUG("added document collection from '%s'", file); LOG_DEBUG("added document collection from '%s'", file);
} }