Merge commit 'mdkent/SIGAR-167'
This commit is contained in:
		
						commit
						64fd05c615
					
				@ -42,31 +42,32 @@ iflist.each do |ifname|
 | 
				
			|||||||
    " MTU:" + ifconfig.mtu.to_s +
 | 
					    " MTU:" + ifconfig.mtu.to_s +
 | 
				
			||||||
    " Metric:" + ifconfig.metric.to_s
 | 
					    " Metric:" + ifconfig.metric.to_s
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  ifstat = sigar.net_interface_stat(ifname)
 | 
					  if (!ifname.include?(":"))
 | 
				
			||||||
 | 
					    ifstat = sigar.net_interface_stat(ifname)
 | 
				
			||||||
 | 
					    puts "\t" +
 | 
				
			||||||
 | 
					        "RX packets:" + ifstat.rx_packets.to_s +
 | 
				
			||||||
 | 
					        " errors:" + ifstat.rx_errors.to_s +
 | 
				
			||||||
 | 
					        " dropped:" + ifstat.rx_dropped.to_s +
 | 
				
			||||||
 | 
					        " overruns:" + ifstat.rx_overruns.to_s +
 | 
				
			||||||
 | 
					        " frame:" + ifstat.rx_frame.to_s
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  puts "\t" +
 | 
					    puts "\t" +
 | 
				
			||||||
      "RX packets:" + ifstat.rx_packets.to_s +
 | 
					        "TX packets:" + ifstat.tx_packets.to_s +
 | 
				
			||||||
      " errors:" + ifstat.rx_errors.to_s +
 | 
					        " errors:" + ifstat.tx_errors.to_s +
 | 
				
			||||||
      " dropped:" + ifstat.rx_dropped.to_s +
 | 
					        " dropped:" + ifstat.tx_dropped.to_s +
 | 
				
			||||||
      " overruns:" + ifstat.rx_overruns.to_s +
 | 
					        " overruns:" + ifstat.tx_overruns.to_s +
 | 
				
			||||||
      " frame:" + ifstat.rx_frame.to_s
 | 
					        " carrier:" + ifstat.tx_carrier.to_s
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  puts "\t" +
 | 
					    puts "\t" + "collisions:" + ifstat.tx_collisions.to_s
 | 
				
			||||||
      "TX packets:" + ifstat.tx_packets.to_s +
 | 
					 | 
				
			||||||
      " errors:" + ifstat.tx_errors.to_s +
 | 
					 | 
				
			||||||
      " dropped:" + ifstat.tx_dropped.to_s +
 | 
					 | 
				
			||||||
      " overruns:" + ifstat.tx_overruns.to_s +
 | 
					 | 
				
			||||||
      " carrier:" + ifstat.tx_carrier.to_s
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  puts "\t" + "collisions:" + ifstat.tx_collisions.to_s
 | 
					    rx_bytes = ifstat.rx_bytes
 | 
				
			||||||
 | 
					    tx_bytes = ifstat.tx_bytes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  rx_bytes = ifstat.rx_bytes
 | 
					    print "\t" +
 | 
				
			||||||
  tx_bytes = ifstat.tx_bytes
 | 
					      "RX bytes:" + rx_bytes.to_s +
 | 
				
			||||||
 | 
					      " (" + Sigar.format_size(rx_bytes) + ")" +
 | 
				
			||||||
  print "\t" +
 | 
					      "  " +
 | 
				
			||||||
    "RX bytes:" + rx_bytes.to_s +
 | 
					      "TX bytes:" + tx_bytes.to_s +
 | 
				
			||||||
    " (" + Sigar.format_size(rx_bytes) + ")" +
 | 
					      " (" + Sigar.format_size(tx_bytes) + ")" + "\n";
 | 
				
			||||||
    "  " +
 | 
					  end
 | 
				
			||||||
    "TX bytes:" + tx_bytes.to_s +
 | 
					 | 
				
			||||||
    " (" + Sigar.format_size(tx_bytes) + ")" + "\n";
 | 
					 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user