Skip to content

Commit

Permalink
Merge branch 'zap_errors_not_critical' into 'OVIS-3.4'
Browse files Browse the repository at this point in the history
Zap errors not critical

This changes the log handle given zap from ldmsd_lcritical to ldmsd_lwarning.

See merge request !642
  • Loading branch information
narategithub committed Aug 31, 2017
2 parents d606eb6 + ad7998b commit bfc06a1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions ldms/src/ldmsd/ldmsd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1040,10 +1040,10 @@ void listen_on_transport(char *xprt_str, char *port_str)
else
port_no = atoi(port_str);
#if OVIS_LIB_HAVE_AUTH
l = ldms_xprt_with_auth_new(xprt_str, ldmsd_lcritical,
l = ldms_xprt_with_auth_new(xprt_str, ldmsd_linfo,
secretword);
#else
l = ldms_xprt_new(xprt_str, ldmsd_lcritical);
l = ldms_xprt_new(xprt_str, ldmsd_linfo);
#endif /* OVIS_LIB_HAVE_AUTH */
if (!l) {
ldmsd_log(LDMSD_LERROR, "The transport specified, "
Expand Down
4 changes: 2 additions & 2 deletions ldms/src/ldmsd/ldmsd_prdcr.c
Original file line number Diff line number Diff line change
Expand Up @@ -381,9 +381,9 @@ static void prdcr_connect(ldmsd_prdcr_t prdcr)
prdcr->conn_state = LDMSD_PRDCR_STATE_CONNECTING;
#if OVIS_LIB_HAVE_AUTH
prdcr->xprt = ldms_xprt_with_auth_new(prdcr->xprt_name,
ldmsd_lcritical, ldmsd_secret_get());
ldmsd_linfo, ldmsd_secret_get());
#else
prdcr->xprt = ldms_xprt_new(prdcr->xprt_name, ldmsd_lcritical);
prdcr->xprt = ldms_xprt_new(prdcr->xprt_name, ldmsd_linfo);
#endif /* OVIS_LIB_HAVE_AUTH */
if (prdcr->xprt) {
ret = ldms_xprt_connect(prdcr->xprt,
Expand Down

0 comments on commit bfc06a1

Please sign in to comment.