vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'develop'

Browse source
This commit is contained in:
Nabin Hait 2017-05-10 17:36:00 +05:30
commit 4e80f58f63
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template
__version__ = '8.0.40'
__version__ = '8.0.41'
__title__ = "Frappe Framework"
local = Local()

9
socketio.js
View file

@ -7,6 +7,7 @@ var redis = require("redis");
var request = require('superagent');
var conf = get_conf();
var flags = {};
var subscriber = redis.createClient(conf.redis_socketio || conf.redis_async_broker_port);
// serve socketio
@ -31,6 +32,14 @@ io.on('connection', function(socket){
return;
}
if(flags[sid]) {
// throttle this function
return;
}
flags[sid] = sid;
setTimeout(function() { flags[sid] = null; }, 10000);
socket.user = cookie.parse(socket.request.headers.cookie).user_id;
// console.log("firing get_user_info");