diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs b/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs index d4a1ec3..01d95e9 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs | |||
| @@ -69,13 +69,13 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 69 | { | 69 | { |
| 70 | StatsManager.RegisterStat( | 70 | StatsManager.RegisterStat( |
| 71 | new Stat( | 71 | new Stat( |
| 72 | "requests", | 72 | "requests", |
| 73 | "requests", | 73 | "requests", |
| 74 | "Number of requests received by this service endpoint", | 74 | "Number of requests received by this service endpoint", |
| 75 | "requests", | 75 | "requests", |
| 76 | "service", | 76 | "service", |
| 77 | string.Format("{0}:{1}", httpMethod, path), | 77 | string.Format("{0}:{1}", httpMethod, path), |
| 78 | StatType.Pull, | 78 | StatType.Pull, |
| 79 | MeasuresOfInterest.AverageChangeOverTime, | 79 | MeasuresOfInterest.AverageChangeOverTime, |
| 80 | s => s.Value = RequestsReceived, | 80 | s => s.Value = RequestsReceived, |
| 81 | StatVerbosity.Debug)); | 81 | StatVerbosity.Debug)); |