improved logging
This commit is contained in:
parent
45d8cb8136
commit
e02042cade
|
@ -95,7 +95,7 @@ void CacheSystem_init(const char *path, int url_supplied)
|
||||||
path = CacheSystem_calc_dir(path);
|
path = CacheSystem_calc_dir(path);
|
||||||
}
|
}
|
||||||
|
|
||||||
lprintf(debug, "directory: %s\n", path);
|
lprintf(debug, "%s\n", path);
|
||||||
|
|
||||||
META_DIR = path_append(path, "meta/");
|
META_DIR = path_append(path, "meta/");
|
||||||
DATA_DIR = path_append(path, "data/");
|
DATA_DIR = path_append(path, "data/");
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
#include "fuse_local.h"
|
#include "fuse_local.h"
|
||||||
|
|
||||||
#include "cache.h"
|
#include "cache.h"
|
||||||
|
#include "log.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* must be included before including <fuse.h>
|
* must be included before including <fuse.h>
|
||||||
|
@ -21,6 +22,7 @@ static void *fs_init(struct fuse_conn_info *conn)
|
||||||
/** \brief release an opened file */
|
/** \brief release an opened file */
|
||||||
static int fs_release(const char *path, struct fuse_file_info *fi)
|
static int fs_release(const char *path, struct fuse_file_info *fi)
|
||||||
{
|
{
|
||||||
|
lprintf(info, "%s\n", path);
|
||||||
(void) path;
|
(void) path;
|
||||||
if (CACHE_SYSTEM_INIT) {
|
if (CACHE_SYSTEM_INIT) {
|
||||||
Cache_close((Cache *) fi->fh);
|
Cache_close((Cache *) fi->fh);
|
||||||
|
@ -88,6 +90,7 @@ fs_read(const char *path, char *buf, size_t size, off_t offset,
|
||||||
/** \brief open a file indicated by the path */
|
/** \brief open a file indicated by the path */
|
||||||
static int fs_open(const char *path, struct fuse_file_info *fi)
|
static int fs_open(const char *path, struct fuse_file_info *fi)
|
||||||
{
|
{
|
||||||
|
lprintf(info, "%s\n", path);
|
||||||
Link *link = path_to_Link(path);
|
Link *link = path_to_Link(path);
|
||||||
if (!link) {
|
if (!link) {
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
|
@ -133,7 +136,6 @@ fs_readdir(const char *path, void *buf, fuse_fill_dir_t dir_add,
|
||||||
{
|
{
|
||||||
(void) offset;
|
(void) offset;
|
||||||
(void) fi;
|
(void) fi;
|
||||||
|
|
||||||
LinkTable *linktbl;
|
LinkTable *linktbl;
|
||||||
|
|
||||||
if (!strcmp(path, "/")) {
|
if (!strcmp(path, "/")) {
|
||||||
|
|
|
@ -353,7 +353,7 @@ static void LinkTable_uninitialised_fill(LinkTable * linktbl)
|
||||||
while (u);
|
while (u);
|
||||||
if (CONFIG.log_type & debug) {
|
if (CONFIG.log_type & debug) {
|
||||||
erase_string(stderr, STATUS_LEN, s);
|
erase_string(stderr, STATUS_LEN, s);
|
||||||
fprintf(stderr, "Done!\n");
|
fprintf(stderr, "... Done!\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -424,7 +424,7 @@ void LinkTable_print(LinkTable * linktbl)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
lprintf(info, "--------------------------------------------\n");
|
lprintf(info, "--------------------------------------------\n");
|
||||||
lprintf(info, "LinkTable_print(): Invalid link count: %d\n", j);
|
lprintf(info, " Invalid link count: %d\n", j);
|
||||||
lprintf(info, "--------------------------------------------\n");
|
lprintf(info, "--------------------------------------------\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
13
src/log.c
13
src/log.c
|
@ -24,28 +24,27 @@ log_printf(LogType type, const char *file, const char *func, int line,
|
||||||
if (type & CONFIG.log_type) {
|
if (type & CONFIG.log_type) {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case fatal:
|
case fatal:
|
||||||
fprintf(out, "Fatal: ");
|
fprintf(out, "Fatal:");
|
||||||
break;
|
break;
|
||||||
case error:
|
case error:
|
||||||
fprintf(out, "Error: ");
|
fprintf(out, "Error:");
|
||||||
break;
|
break;
|
||||||
case warning:
|
case warning:
|
||||||
fprintf(out, "Warning: ");
|
fprintf(out, "Warning:");
|
||||||
break;
|
break;
|
||||||
case info:
|
case info:
|
||||||
out = stderr;
|
|
||||||
goto print_actual_message;
|
goto print_actual_message;
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
fprintf(out, "Debug (%x):", type);
|
fprintf(out, "Debug(%x):", type);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
fprintf(out, "(%s:%s:%d): ", file, func, line);
|
fprintf(out, "%s:%d:", file, line);
|
||||||
|
|
||||||
print_actual_message:
|
print_actual_message:
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
fprintf(out, "%s: ", func);
|
||||||
va_list args;
|
va_list args;
|
||||||
va_start(args, format);
|
va_start(args, format);
|
||||||
vfprintf(out, format, args);
|
vfprintf(out, format, args);
|
||||||
|
|
|
@ -18,7 +18,7 @@ typedef enum {
|
||||||
/**
|
/**
|
||||||
* \brief The default log level
|
* \brief The default log level
|
||||||
*/
|
*/
|
||||||
#define DEFAULT_LOG_LEVEL fatal | error | warning | info | debug
|
#define DEFAULT_LOG_LEVEL fatal | error | warning | info
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Get the log level from the environment.
|
* \brief Get the log level from the environment.
|
||||||
|
|
Loading…
Reference in New Issue