extern/encfs
1
0
Fork 0
mirror of https://github.com/vgough/encfs.git synced 2024-11-29 03:15:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve log messages

Browse Source
This commit is contained in:
benrubson 2017-02-17 11:44:50 +01:00
parent bb5900dada
commit 756a5aced4
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
encfs/main.cpp
View File

@ -710,6 +710,11 @@ static void *idleMonitor(void *_arg) {
const int timeoutCycles = 60 * arg->idleTimeout / ActivityCheckInterval; const int timeoutCycles = 60 * arg->idleTimeout / ActivityCheckInterval;
int idleCycles = -1; int idleCycles = -1;
bool unmountres = false;
// We will notify when FS will be unmounted, so notify that it has just been mounted
RLOG(INFO) << "Filesystem mounted: " << arg->opts->mountPoint;
pthread_mutex_lock(&ctx->wakeupMutex); pthread_mutex_lock(&ctx->wakeupMutex);
while (ctx->running) { while (ctx->running) {
@ -723,7 +728,8 @@ static void *idleMonitor(void *_arg) {
if (idleCycles >= timeoutCycles) { if (idleCycles >= timeoutCycles) {
int openCount = ctx->openFileCount(); int openCount = ctx->openFileCount();
if (openCount == 0) { if (openCount == 0) {
if (unmountFS(ctx)) { unmountres = unmountFS(ctx);
if (unmountres) {
// wait for main thread to wake us up // wait for main thread to wake us up
pthread_cond_wait(&ctx->wakeupCond, &ctx->wakeupMutex); pthread_cond_wait(&ctx->wakeupCond, &ctx->wakeupMutex);
break; break;
@ -747,6 +753,10 @@ static void *idleMonitor(void *_arg) {
pthread_mutex_unlock(&ctx->wakeupMutex); pthread_mutex_unlock(&ctx->wakeupMutex);
// If we are here FS has been unmounted, so if we did not unmount ourselves (manual, kill...), notify
if (!unmountres)
RLOG(INFO) << "Filesystem unmounted: " << arg->opts->mountPoint;
VLOG(1) << "Idle monitoring thread exiting"; VLOG(1) << "Idle monitoring thread exiting";
return 0; return 0;