mleinart

diff --git a/webapp/graphite/remote_storage.py b/webapp/graphite/remote_storage.py
index 693e0fd..d51d27c 100644
--- a/webapp/graphite/remote_storage.py
+++ b/webapp/graphite/remote_storage.py
@@ -5,11 +5,7 @@ from urllib import urlencode
 from django.core.cache import cache
 from django.conf import settings
 from graphite.render.hashing import compactHash
-
-try:

mleinart

diff --git a/webapp/graphite/remote_storage.py b/webapp/graphite/remote_storage.py
index b33250f..1f8a578 100644
--- a/webapp/graphite/remote_storage.py
+++ b/webapp/graphite/remote_storage.py
@@ -5,11 +5,7 @@ from urllib import urlencode
 from django.core.cache import cache
 from django.conf import settings
 from graphite.render.hashing import compactHash
-
-try:

mleinart

diff --git a/webapp/graphite/remote_storage.py b/webapp/graphite/remote_storage.py
index 693e0fd..d51d27c 100644
--- a/webapp/graphite/remote_storage.py
+++ b/webapp/graphite/remote_storage.py
@@ -5,11 +5,7 @@ from urllib import urlencode
 from django.core.cache import cache
 from django.conf import settings
 from graphite.render.hashing import compactHash
-
-try:

mleinart

#!/usr/bin/env python

import os
import time
import whisper
import sys
from optparse import OptionParser
from random import Random

SPARSE_SPACING = 5

mleinart

Changes

graphite-web

Bugs

• broken nPercentile() and related functions
• Python 2.4 compatibility in browser endpoint (dcarley)
• Missing URL parameters in composer load
• Fix to multiplySeries to return the expected type (nleskiw)
• Don't blow up when empty series passed to cactiStyle (mattus)
• Trailing commas in js breaking ie (nleskiw, davecoutts)
• Remove extra and unnecessary rendering while loading saved graphs (hostedgraphite)

mleinart

diff --git a/webapp/graphite/render/glyph.py b/webapp/graphite/render/glyph.py
index 15ceb0d..23482a7 100644
--- a/webapp/graphite/render/glyph.py
+++ b/webapp/graphite/render/glyph.py
@@ -751,10 +751,22 @@ class LineGraph(Graph):
       'bevel' : cairo.LINE_JOIN_BEVEL,
     }[linejoin])

+    # check whether there is an stacked metric
+    singleStacked = False

mleinart

diff --git a/webapp/graphite/render/glyph.py b/webapp/graphite/render/glyph.py
index 15ceb0d..dadf411 100644
--- a/webapp/graphite/render/glyph.py
+++ b/webapp/graphite/render/glyph.py
@@ -755,6 +755,8 @@ class LineGraph(Graph):
     if self.areaMode == 'stacked' and not self.secondYAxis: #TODO Allow stacked area mode with secondYAxis
       total = []
       for series in self.data:
+        if 'drawAsInfinite' in series.options:
+          continue

mleinart

diff --git a/conf/carbon.conf.example b/conf/carbon.conf.example
index 53708a8..7f35e8e 100644
--- a/conf/carbon.conf.example
+++ b/conf/carbon.conf.example
@@ -30,6 +30,9 @@
 #
 #LOCAL_DATA_DIR = /opt/graphite/storage/whisper/
 
+# Enable daily log rotation. If disabled, a kill -HUP can be used after a manual rotate
+ENABLE_LOGROTATION = True

mleinart

#!/usr/bin/env python

import os
import time
import whisper
import sys
from optparse import OptionParser
from random import Random

SPARSE_SPACING = 5

mleinart

def _walk(*args, **kwargs):

  for root,dirs,files in os.walk(*args, **kwargs):
    for dir in dirs:
      qualified_dir = os.path.join(root,dir)
      if os.path.islink(qualified_dir):
        for x in os.walk(qualified_dir, **kwargs):
          yield x
    yield (root, dirs, files)