summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorliuxueli <[email protected]>2020-11-15 19:57:47 +0600
committerliuxueli <[email protected]>2020-11-15 19:57:47 +0600
commit6b5f3c75441f20b3f24708fc92350ac87c00223f (patch)
tree24fd6e5510901c3a4dedaee05fa2ccef083d39c1
parent517c9f74a7f488bb774ee12b34827914033dfb67 (diff)
修复column的metrics_name填写错误的BUGv2.9.9
-rw-r--r--src/fs2prometheus.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/fs2prometheus.cpp b/src/fs2prometheus.cpp
index 74a46b5..4a4f2d9 100644
--- a/src/fs2prometheus.cpp
+++ b/src/fs2prometheus.cpp
@@ -43,8 +43,10 @@ static char* str_unescape(char* s, char *d, int d_len)
if(d[i-1]=='_')
{
- d[i-1]='\0';
+ i-=1;
}
+
+ d[i]='\0';
return 0;
}
@@ -227,7 +229,7 @@ static void FS_library_promethues_output(struct mg_connection *c, int ev, void *
continue;
}
str_unescape(p->name, line_name, sizeof(line_name));
- str_unescape(p->name, column_name, sizeof(column_name));
+ str_unescape(p_column->name, column_name, sizeof(column_name));
str_unescape(fs2_handle->app_name, app_name, sizeof(app_name));
value=get_stat_unit_val(p, p_column->column_seq, FS_CALC_CURRENT, 1);
used_len+=snprintf(payload+used_len,