tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Ensure that exceptions while rendering individual metrics don't stop others from being rendered anyway - especially useful for CallbackMetric

Browse source
This commit is contained in:
Paul "LeoNerd" Evans 2015-03-04 17:13:09 +00:00
parent 59c448f074
commit e02cc249da
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
synapse/metrics/__init__.py
View file

@ -13,9 +13,14 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import logging
from .metric import CounterMetric, CallbackMetric, CacheCounterMetric from .metric import CounterMetric, CallbackMetric, CacheCounterMetric
logger = logging.getLogger(__name__)
# We'll keep all the available metrics in a single toplevel dict, one shared # We'll keep all the available metrics in a single toplevel dict, one shared
# for the entire process. We don't currently support per-HomeServer instances # for the entire process. We don't currently support per-HomeServer instances
# of metrics, because in practice any one python VM will host only one # of metrics, because in practice any one python VM will host only one
@ -82,6 +87,10 @@ def render_all():
strs = [] strs = []
for name in sorted(all_metrics.keys()): for name in sorted(all_metrics.keys()):
strs += all_metrics[name].render() try:
strs += all_metrics[name].render()
except Exception as e:
strs += ["# FAILED to render %s" % name]
logger.exception("Failed to render %s metric", name)
return "\n".join(strs) return "\n".join(strs)