Merge pull request Open-CAS#8 from wolszews/remove-log-prefix

Remove OCF prefix
vzhereb9 · Dec 7, 2018 · c0079e4 · c0079e4
2 parents 8be3b88 + 0cb11b0
commit c0079e4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/src/engine/engine_common.c b/src/engine/engine_common.c
@@ -585,7 +585,7 @@ static int _ocf_engine_refresh(struct ocf_request *rq)
  else
  ENV_BUG();
  } else {
- ENV_WARN(true, OCF_PREFIX_SHORT" Inconsistent request");
+ ENV_WARN(true, "Inconsistent request");
  rq->error = -EINVAL;
 
  /* Complete request */

diff --git a/src/ocf_ctx_priv.h b/src/ocf_ctx_priv.h
@@ -33,7 +33,7 @@ struct ocf_ctx {
 };
 
 #define ocf_log_prefix(ctx, lvl, prefix, fmt, ...) \
- ocf_log_raw(ctx->logger, lvl, OCF_PREFIX_SHORT prefix fmt, ##__VA_ARGS__)
+ ocf_log_raw(ctx->logger, lvl, prefix fmt, ##__VA_ARGS__)
 
 #define ocf_log(ctx, lvl, fmt, ...) \
  ocf_log_prefix(ctx, lvl, "", fmt, ##__VA_ARGS__)

diff --git a/tests/ut/ocf_env/ocf_env.c b/tests/ut/ocf_env/ocf_env.c
@@ -119,7 +119,7 @@ void env_allocator_destroy(env_allocator *allocator)
  if (allocator) {
  if (env_atomic_read(&allocator->count)) {
  fprintf(stderr, "Not all object deallocated\n");
- ENV_WARN(true, OCF_PREFIX_SHORT" Cleanup problem\n");
+ ENV_WARN(true, "Cleanup problem\n");
  }
 
  free(allocator->name);

diff --git a/tests/ut/ocf_env/ocf_env.h b/tests/ut/ocf_env/ocf_env.h
@@ -13,8 +13,6 @@
 #define __USE_GNU
 #endif
 
-#define OCF_PREFIX_SHORT "OCF"
-
 #include <linux/limits.h>
 #include <linux/stddef.h>
 #include <stdint.h>