diff options
Diffstat (limited to 'OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs')
-rw-r--r-- | OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs b/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs index 3765efb..109a58f 100644 --- a/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs +++ b/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs | |||
@@ -405,6 +405,15 @@ Asset service request failures: {3}" + Environment.NewLine, | |||
405 | /// <returns></returns> | 405 | /// <returns></returns> |
406 | public override string XReport(string uptime, string version) | 406 | public override string XReport(string uptime, string version) |
407 | { | 407 | { |
408 | return OSDParser.SerializeJsonString(OReport(uptime, version)); | ||
409 | } | ||
410 | |||
411 | /// <summary> | ||
412 | /// Report back collected statistical information as an OSDMap | ||
413 | /// </summary> | ||
414 | /// <returns></returns> | ||
415 | public override OSDMap OReport(string uptime, string version) | ||
416 | { | ||
408 | OSDMap args = new OSDMap(30); | 417 | OSDMap args = new OSDMap(30); |
409 | // args["AssetsInCache"] = OSD.FromString (String.Format ("{0:0.##}", AssetsInCache)); | 418 | // args["AssetsInCache"] = OSD.FromString (String.Format ("{0:0.##}", AssetsInCache)); |
410 | // args["TimeAfterCacheMiss"] = OSD.FromString (String.Format ("{0:0.##}", | 419 | // args["TimeAfterCacheMiss"] = OSD.FromString (String.Format ("{0:0.##}", |
@@ -442,13 +451,11 @@ Asset service request failures: {3}" + Environment.NewLine, | |||
442 | args["Uptime"] = OSD.FromString (uptime); | 451 | args["Uptime"] = OSD.FromString (uptime); |
443 | args["Version"] = OSD.FromString (version); | 452 | args["Version"] = OSD.FromString (version); |
444 | 453 | ||
445 | string strBuffer = ""; | 454 | return args; |
446 | strBuffer = OSDParser.SerializeJsonString(args); | ||
447 | |||
448 | return strBuffer; | ||
449 | } | 455 | } |
450 | } | 456 | } |
451 | 457 | ||
458 | |||
452 | /// <summary> | 459 | /// <summary> |
453 | /// Pull packet queue stats from packet queues and report | 460 | /// Pull packet queue stats from packet queues and report |
454 | /// </summary> | 461 | /// </summary> |
@@ -474,5 +481,11 @@ Asset service request failures: {3}" + Environment.NewLine, | |||
474 | { | 481 | { |
475 | return ""; | 482 | return ""; |
476 | } | 483 | } |
484 | |||
485 | public OSDMap OReport(string uptime, string version) | ||
486 | { | ||
487 | OSDMap ret = new OSDMap(); | ||
488 | return ret; | ||
489 | } | ||
477 | } | 490 | } |
478 | } | 491 | } |