mirror of https://gitee.com/bigwinds/arangodb
Bug fix/small issues 1608 (#3049)
* extend linenoise character buffer size * dont make it throw exceptions all the time * set INSTANCE to nullptr at a later stage otherwise a nullptr may be accessed during shutdown
This commit is contained in:
parent
e612aad2a3
commit
b4c58d757f
|
@ -533,8 +533,8 @@ struct linenoiseCompletions {
|
||||||
vector<Utf32String> completionStrings;
|
vector<Utf32String> completionStrings;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define LINENOISE_DEFAULT_HISTORY_MAX_LEN 100
|
#define LINENOISE_DEFAULT_HISTORY_MAX_LEN 128
|
||||||
#define LINENOISE_MAX_LINE 4096
|
#define LINENOISE_MAX_LINE 8192
|
||||||
|
|
||||||
// make control-characters more readable
|
// make control-characters more readable
|
||||||
#define ctrlChar(upperCaseASCII) (upperCaseASCII - 0x40)
|
#define ctrlChar(upperCaseASCII) (upperCaseASCII - 0x40)
|
||||||
|
|
|
@ -188,6 +188,5 @@ AuthInfo* AuthenticationFeature::authInfo() {
|
||||||
return _authInfo;
|
return _authInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
void AuthenticationFeature::unprepare() {}
|
void AuthenticationFeature::unprepare() { INSTANCE = nullptr; }
|
||||||
|
|
||||||
void AuthenticationFeature::stop() { INSTANCE = nullptr; }
|
|
||||||
|
|
|
@ -42,7 +42,6 @@ class AuthenticationFeature final
|
||||||
void validateOptions(std::shared_ptr<options::ProgramOptions>) override final;
|
void validateOptions(std::shared_ptr<options::ProgramOptions>) override final;
|
||||||
void prepare() override final;
|
void prepare() override final;
|
||||||
void start() override final;
|
void start() override final;
|
||||||
void stop() override final;
|
|
||||||
void unprepare() override final;
|
void unprepare() override final;
|
||||||
|
|
||||||
bool isActive() const { return _active && isEnabled(); }
|
bool isActive() const { return _active && isEnabled(); }
|
||||||
|
|
|
@ -3063,6 +3063,8 @@ static void JS_CollectionsVocbase(
|
||||||
};
|
};
|
||||||
colls = GetCollectionsCluster(vocbase);
|
colls = GetCollectionsCluster(vocbase);
|
||||||
} else {
|
} else {
|
||||||
|
// no cleanup needed
|
||||||
|
cleanup = []() {};
|
||||||
colls = vocbase->collections(false);
|
colls = vocbase->collections(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue