Merge pull request #295 from ontologyzsy/master

adapt to multi-netcards
baidu · Jan 14, 2016 · c12f826 · c12f826
2 parents c29f386 + 37a19a6
commit c12f826
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/build.sh b/build.sh
diff --git a/src/agent/resource_collector.cc b/src/agent/resource_collector.cc
@@ -574,11 +574,14 @@ bool GlobalResourceCollector::GetGlobalNetStat() {
     boost::split(lines, content, boost::is_any_of("\n"));
     for (size_t n = 0; n < lines.size(); n++) {
         std::string line = lines[n];
-        if (line.find("eth0") != std::string::npos || 
-                line.find("xgbe0") != std::string::npos) {
+        if (line.find("eth") != std::string::npos || 
+                line.find("xgbe") != std::string::npos) {
             boost::trim(line);
             std::vector<std::string> parts;
             boost::split(parts, line, boost::is_any_of(" "), boost::token_compress_on);
+            if (boost::lexical_cast<int64_t>(parts[1]) == 0) {
+                continue;
+            }
             std::vector<std::string> tokens;
             boost::split(tokens, parts[0], boost::is_any_of(":"));
             stat_->cur_stat_.net_in_bits = boost::lexical_cast<int64_t>(tokens[1]);