Commit 7c1b261e authored by Marc Vef's avatar Marc Vef
Browse files

ifs: minor logging configuration change

parent b756e9b4

ifs/configure.hpp

+3 −3
Original line number Diff line number Diff line
@@ -9,11 +9,11 @@ 
//#define LOG_INFO

#define LOG_DEBUG

//#define LOG_TRACE

#define LOG_PATH "/tmp/adafs.log"

#define LOG_DAEMON_PATH "/tmp/adafs_daemon.log"



// Enable logging for daemon

#define LOG_DAEMON_DEBUG 1

#define LOG_DAEMON_PATH "/tmp/adafs_daemon.log"

#define LOG_PRELOAD_DEBUG 1

#define LOG_PRELOAD_PATH "/tmp/adafs_preload.log"



// If ACM time should be considered

#define ACMtime

ifs/include/preload/preload.hpp

+2 −2
Original line number Diff line number Diff line
@@ -46,9 +46,9 @@ extern shared_ptr<struct FsConfig> fs_config; 
extern FILE* debug_fd;



#define DAEMON_DEBUG(fd, fmt, ...) \

            do { if (LOG_DAEMON_DEBUG) fprintf(fd, "[" __DATE__ ":" __TIME__ "] " fmt, ##__VA_ARGS__); fflush(fd); } while (0)

            do { if (LOG_PRELOAD_DEBUG) fprintf(fd, "[" __DATE__ ":" __TIME__ "] " fmt, ##__VA_ARGS__); fflush(fd); } while (0)

#define DAEMON_DEBUG0(fd, fmt) \

            do { if (LOG_DAEMON_DEBUG) fprintf(fd, "[" __DATE__ ":" __TIME__ "] " fmt); fflush(fd); } while (0)

            do { if (LOG_PRELOAD_DEBUG) fprintf(fd, "[" __DATE__ ":" __TIME__ "] " fmt); fflush(fd); } while (0)





bool init_ld_argobots();

ifs/main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ int main(int argc, const char* argv[]) { 




    //set the spdlogger and initialize it with spdlog

    ADAFS_DATA->spdlogger(spdlog::basic_logger_mt("basic_logger", LOG_PATH));

    ADAFS_DATA->spdlogger(spdlog::basic_logger_mt("basic_logger", LOG_DAEMON_PATH));

#if defined(LOG_TRACE)

    spdlog::set_level(spdlog::level::trace);

    ADAFS_DATA->spdlogger()->flush_on(spdlog::level::trace);

ifs/src/preload/preload.cpp

+1 −1
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ void init_passthrough_() { 
    libc_dup = dlsym(libc, "dup");

    libc_dup2 = dlsym(libc, "dup2");



    debug_fd = fopen(LOG_DAEMON_PATH, "a+");

    debug_fd = fopen(LOG_PRELOAD_PATH, "a+");

    fs_config = make_shared<struct FsConfig>();

    DAEMON_DEBUG0(debug_fd, "Passthrough initialized.\n");

}