Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #73 from jaggerwang/master
Fix no data in realtime mod bug, and set default js interval to 5s.
  • Loading branch information
nkrode committed Jan 5, 2015
2 parents 1422bc0 + 1c521ff commit dee5149
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 14 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Expand Up @@ -28,4 +28,6 @@ pip-log.txt

.DS_Store

*.sublime-workspace
*.sublime-workspace
*.sublime-project
src/redis-live.conf
8 changes: 0 additions & 8 deletions redislive.sublime-project

This file was deleted.

2 changes: 1 addition & 1 deletion src/api/controller/CommandsController.py
Expand Up @@ -16,7 +16,7 @@ def get(self):
from_date = self.get_argument("from", None)
to_date = self.get_argument("to", None)

if from_date == None or to_date == None:
if not from_date or not to_date:
end = datetime.now()
delta = timedelta(seconds=120)
start = end - delta
Expand Down
2 changes: 1 addition & 1 deletion src/api/controller/MemoryController.py
Expand Up @@ -15,7 +15,7 @@ def get(self):
return_data = dict(data=[],
timestamp=datetime.datetime.now().isoformat())

if from_date==None or to_date==None:
if not from_date or not to_date:
end = datetime.datetime.now()
delta = datetime.timedelta(seconds=60)
start = end - delta
Expand Down
2 changes: 1 addition & 1 deletion src/api/controller/TopCommandsController.py
Expand Up @@ -15,7 +15,7 @@ def get(self):
from_date = self.get_argument("from", None)
to_date = self.get_argument("to", None)

if from_date==None or to_date==None:
if not from_date or not to_date:
end = datetime.datetime.now()
delta = datetime.timedelta(seconds=120)
start = end - delta
Expand Down
2 changes: 1 addition & 1 deletion src/api/controller/TopKeysController.py
Expand Up @@ -14,7 +14,7 @@ def get(self):
from_date = self.get_argument("from", None)
to_date = self.get_argument("to", None)

if from_date==None or to_date==None:
if not from_date or not to_date:
end = datetime.datetime.now()
delta = datetime.timedelta(seconds=120)
start = end - delta
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/www/js/views/base-widget-view.js
Expand Up @@ -2,7 +2,7 @@ var BaseWidget = Backbone.View.extend({

enableLogging : false

, updateFrequency : 1000
, updateFrequency : 5000

, Name : "BaseWidget"

Expand Down

0 comments on commit dee5149

Please sign in to comment.