|
24 | 24 | from graphite.compat import HttpResponse
|
25 | 25 | from graphite.errors import InputParameterError, handleInputParameterError
|
26 | 26 | from graphite.user_util import getProfileByUsername
|
27 |
| -from graphite.util import json, unpickle, pickle, msgpack, BytesIO |
| 27 | +from graphite.util import json, msgpack, BytesIO # Removed unpickle, pickle |
28 | 28 | from graphite.storage import extractForwardHeaders
|
29 | 29 | from graphite.logger import log
|
30 | 30 | from graphite.render.evaluator import evaluateTarget
|
@@ -499,7 +499,7 @@ def delegateRendering(graphType, graphOptions, headers=None):
|
499 | 499 | if headers is None:
|
500 | 500 | headers = {}
|
501 | 501 | start = time()
|
502 |
| - postData = (graphType + '\n').encode() + pickle.dumps(graphOptions) |
| 502 | + postData = (graphType + '\n').encode() + json.dumps(graphOptions).encode('utf-8') |
503 | 503 | servers = settings.RENDERING_HOSTS[:] #make a copy so we can shuffle it safely
|
504 | 504 | shuffle(servers)
|
505 | 505 | connector_class = connector_class_selector(settings.INTRACLUSTER_HTTPS)
|
@@ -552,7 +552,7 @@ def renderLocalView(request):
|
552 | 552 | optionsPickle = reqParams.read()
|
553 | 553 | reqParams.close()
|
554 | 554 | graphClass = GraphTypes[graphType]
|
555 |
| - options = unpickle.loads(optionsPickle) |
| 555 | + options = json.loads(optionsPickle.decode('utf-8')) |
556 | 556 | image = doImageRender(graphClass, options)
|
557 | 557 | log.rendering("Delegated rendering request took %.6f seconds" % (time() - start))
|
558 | 558 | response = buildResponse(image)
|
|
0 commit comments