Skip to content

Commit

Permalink
Merge pull request #278 from pantheon-systems/dev
Browse files Browse the repository at this point in the history
Merge dev to yolo: Log less
  • Loading branch information
jerryblakley committed Apr 18, 2016
2 parents f5b618f + 76f36e3 commit c4bcf90
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/fusedav.c
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ static void getdir_propfind_callback(__unused void *userdata, const char *path,
if (status_code == 410) {
struct stat_cache_value *existing;

log_print(LOG_NOTICE, SECTION_FUSEDAV_PROP, "%s: DELETE %s (%lu)", funcname, path, status_code);
log_print(LOG_INFO, SECTION_FUSEDAV_PROP, "%s: DELETE %s (%lu)", funcname, path, status_code);
existing = stat_cache_value_get(config->cache, path, true, &subgerr1);
if (subgerr1) {
g_propagate_prefixed_error(gerr, subgerr1, "%s: ", funcname);
Expand Down Expand Up @@ -281,7 +281,7 @@ static void getdir_propfind_callback(__unused void *userdata, const char *path,
}
}

log_print(LOG_NOTICE, SECTION_FUSEDAV_PROP, "Removing path: %s", path);
log_print(LOG_INFO, SECTION_FUSEDAV_PROP, "Removing path: %s", path);
stat_cache_delete(config->cache, path, &subgerr1);
filecache_delete(config->cache, path, true, &subgerr2);
// If we need to combine 2 errors, use one of the error messages in the propagated prefix
Expand Down
6 changes: 3 additions & 3 deletions src/session.c
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ static void update_session_count(bool add) {

if (add) __sync_fetch_and_add(&current_session_count, 1);
else __sync_fetch_and_sub(&current_session_count, 1);
log_print(LOG_NOTICE, SECTION_SESSION_DEFAULT, "update_session_count: %d", current_session_count);
log_print(LOG_INFO, SECTION_SESSION_DEFAULT, "update_session_count: %d", current_session_count);
}

static void print_errors(const int iter, const char *type_str, const char *fcn_name,
Expand Down Expand Up @@ -811,7 +811,7 @@ static void construct_resolve_slist(GHashTable *addr_table) {

// addr_score_idx is the number of addresses we processed above
for (int idx = 0; idx < addr_score_idx; idx++) {
log_print(LOG_NOTICE, SECTION_SESSION_DEFAULT,
log_print(LOG_DYNAMIC, SECTION_SESSION_DEFAULT,
"%s: inserting into resolve_slist (%p): %s, score %d",
funcname, node_status.resolve_slist, addr_score[idx]->addr, addr_score[idx]->score);
node_status.resolve_slist = curl_slist_append(node_status.resolve_slist, addr_score[idx]->addr);
Expand Down Expand Up @@ -1151,7 +1151,7 @@ static bool needs_new_session(bool tmp_session) {

// timeout
else if (slist_timed_out()) {
log_print(LOG_NOTICE, SECTION_SESSION_DEFAULT, "%s: slist_timed_out", funcname);
log_print(LOG_INFO, SECTION_SESSION_DEFAULT, "%s: slist_timed_out", funcname);
new_session = true;
}

Expand Down

0 comments on commit c4bcf90

Please sign in to comment.