diff options
Diffstat (limited to 'xlators/cluster/nsr-recon/src/recon_xlator.h')
| -rw-r--r-- | xlators/cluster/nsr-recon/src/recon_xlator.h | 46 |
1 files changed, 15 insertions, 31 deletions
diff --git a/xlators/cluster/nsr-recon/src/recon_xlator.h b/xlators/cluster/nsr-recon/src/recon_xlator.h index 168db518b..a3c91a741 100644 --- a/xlators/cluster/nsr-recon/src/recon_xlator.h +++ b/xlators/cluster/nsr-recon/src/recon_xlator.h @@ -40,41 +40,25 @@ typedef struct _nsr_recon_private_s { uint32_t txn_id; char *changelog_base_path; char *base_dir; -#ifdef NSR_DEBUG - uint32_t recon_main_log_fd; -#endif } nsr_recon_private_t; #define atomic_cmpxchg __sync_val_compare_and_swap -/* - * REVIEW - * Ideally, use gf_log like everyone else. Failing that, at least put the logs - * with all the others in /var/log instead of /tmp. - */ -#ifdef NSR_DEBUG -#define recon_main_log(dom, levl, fmt...) \ - { \ - char c[255]; \ - nsr_recon_private_t *priv = this->private; \ - if (!priv->recon_main_log_fd) { \ - char str[255], b[255]; \ - char *ptr; \ - strcpy(b, priv->replica_group_members[0]); \ - ptr = strchr (b, '/'); \ - while (ptr) { \ - *ptr = '-'; \ - ptr = strchr (b, '/'); \ - } \ - sprintf(str,"/tmp/nsr-logs/%s",b); \ - mkdir("/tmp/nsr-logs/", 0777); \ - mkdir(str, 0777); \ - sprintf(str,"/tmp/nsr-logs/%s/recon-main-log",b); \ - priv->recon_main_log_fd = open(str, O_RDWR|O_CREAT|O_TRUNC); \ - } \ - sprintf(c, fmt); \ - write(priv->recon_main_log_fd, c, strlen(c)); \ - } +#if defined(NSR_DEBUG) + +extern void +_recon_main_log (const char *func, int line, char *member, char *fmt, ...); + +#define recon_main_log(dom, levl, fmt...) do { \ + FMT_WARN (fmt); \ + if (levl <= nsr_debug_level) { \ + nsr_recon_private_t *priv = this->private; \ + _recon_main_log (__FUNCTION__, __LINE__, \ + priv->replica_group_members[0], \ + ##fmt); \ + } \ +} while (0) + #else #define recon_main_log(dom, levl, fmt...) gf_log(dom, levl, fmt) #endif |