MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-01-14 08:15:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

On startup, ensure --sample_file_dir is writable.

Browse Source
This commit is contained in:
Scott Lamb 2016-04-30 08:38:29 -07:00
parent 33b24197c3
commit 374975a73c
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/filesystem.cc
View File

@ -65,6 +65,10 @@ class RealFile : public File {
~RealFile() final { Close(); } ~RealFile() final { Close(); }
int Access(const char *path, int mode, int flags) final {
return faccessat(fd_, path, mode, flags) < 0 ? errno : 0;
}
int Close() final { int Close() final {
if (fd_ < 0) { if (fd_ < 0) {
return 0; return 0;

4
src/filesystem.h
View File

@ -58,6 +58,9 @@ class File {
// Close the file, ignoring the result. // Close the file, ignoring the result.
virtual ~File() {} virtual ~File() {}
// faccessat(), returning 0 on success or errno>0 on failure.
virtual int Access(const char *path, int mode, int flags) = 0;
// Close the file, returning 0 on success or errno>0 on failure. // Close the file, returning 0 on success or errno>0 on failure.
// Already closed is considered a success. // Already closed is considered a success.
virtual int Close() = 0; virtual int Close() = 0;
@ -92,6 +95,7 @@ class File {
class MockFile : public File { class MockFile : public File {
public: public:
MOCK_METHOD3(Access, int(const char *, int, int));
MOCK_METHOD0(Close, int()); MOCK_METHOD0(Close, int());
// The std::unique_ptr<File> variants of Open are wrapped here because gmock's // The std::unique_ptr<File> variants of Open are wrapped here because gmock's

16
src/moonfire-nvr-main.cc
View File

@ -131,13 +131,25 @@ int main(int argc, char** argv) {
env.video_source = moonfire_nvr::GetRealVideoSource(); env.video_source = moonfire_nvr::GetRealVideoSource();
std::unique_ptr<moonfire_nvr::File> sample_file_dir; std::unique_ptr<moonfire_nvr::File> sample_file_dir;
std::string sample_file_dirname = FLAGS_sample_file_dir;
int ret = moonfire_nvr::GetRealFilesystem()->Open( int ret = moonfire_nvr::GetRealFilesystem()->Open(
FLAGS_sample_file_dir.c_str(), O_DIRECTORY | O_RDONLY, &sample_file_dir); sample_file_dirname.c_str(), O_DIRECTORY | O_RDONLY, &sample_file_dir);
if (ret != 0) { if (ret != 0) {
LOG(ERROR) << "Unable to open --sample_file_dir=" << FLAGS_sample_file_dir LOG(ERROR) << "Unable to open --sample_file_dir=" << sample_file_dirname
<< ": " << strerror(ret) << "; exiting."; << ": " << strerror(ret) << "; exiting.";
exit(1); exit(1);
} }
// Separately, ensure the sample file directory is writable.
// (Opening the directory above with O_DIRECTORY|O_RDWR doesn't work even
// when the directory is writable; it fails with EISDIR.)
ret = sample_file_dir->Access(".", W_OK, 0);
if (ret != 0) {
LOG(ERROR) << "--sample_file_dir=" << sample_file_dirname
<< " is not writable: " << strerror(ret) << "; exiting.";
exit(1);
}
env.sample_file_dir = sample_file_dir.release(); env.sample_file_dir = sample_file_dir.release();
moonfire_nvr::Database db; moonfire_nvr::Database db;