0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

remove unused pushChanges

Browse source
This commit is contained in:
j 2016-01-14 17:55:15 +05:30
parent f6cfb255a6
commit 78e48e65bd
4 changed files with 0 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
oml/changelog.py
View file

@ -58,8 +58,6 @@ class Changelog(db.Model):
_data = _data.encode() _data = _data.encode()
state.db.session.add(c) state.db.session.add(c)
state.db.session.commit() state.db.session.commit()
#if state.nodes:
# state.nodes.queue('peered', 'pushChanges', [c.json()])
logger.debug('record change: %s', c.json()) logger.debug('record change: %s', c.json())
@classmethod @classmethod
@ -78,8 +76,6 @@ class Changelog(db.Model):
_data = _data.encode() _data = _data.encode()
state.db.session.add(c) state.db.session.add(c)
state.db.session.commit() state.db.session.commit()
#if state.nodes:
# state.nodes.queue('peered', 'pushChanges', [c.json()])
logger.debug('record change: %s', c.json()) logger.debug('record change: %s', c.json())
@classmethod @classmethod

22
oml/node/nodeapi.py
View file

@ -5,7 +5,6 @@
from changelog import Changelog from changelog import Changelog
from user.models import User from user.models import User
from websocket import trigger_event from websocket import trigger_event
import settings
import state import state
import logging import logging
@ -24,27 +23,6 @@ def api_pullChanges(remote_id, user_id=None, from_=None, to=None):
if user_id: if user_id:
return [] return []
return Changelog.aggregated_changes(from_) return Changelog.aggregated_changes(from_)
'''
if not user_id:
user_id = settings.USER_ID
qs = Changelog.query.filter_by(user_id=user_id)
if from_:
qs = qs.filter(Changelog.revision>=from_)
if to:
qs = qs.filter(Changelog.revision<to)
state.nodes.queue('add', remote_id)
return [c.json() for c in qs]
'''
def api_pushChanges(user_id, changes):
logger.debug('pushChanges no longer used, ignored')
return True
user = User.get(user_id)
if not Changelog.apply_changes(user, changes):
logger.debug('FAILED TO APPLY CHANGE')
state.nodes.queue(user_id, 'pullChanges')
return False
return True
def api_requestPeering(user_id, username, message): def api_requestPeering(user_id, username, message):
user = User.get_or_create(user_id) user = User.get_or_create(user_id)

1
oml/node/server.py
View file

@ -175,7 +175,6 @@ class Handler(http.server.SimpleHTTPRequestHandler):
''' '''
API API
pullChanges [userid] from [to] pullChanges [userid] from [to]
pushChanges [index, change]
requestPeering username message requestPeering username message
acceptPeering username message acceptPeering username message
rejectPeering message rejectPeering message

10
oml/nodes.py
View file

@ -283,16 +283,6 @@ class Node(Thread):
r = Changelog.apply_changes(u, changes) r = Changelog.apply_changes(u, changes)
return r return r
def pushChanges(self, changes):
logger.debug('pushing changes to %s %s', self.user_id, changes)
if self.online:
try:
r = self.request('pushChanges', changes)
except:
self.online = False
r = False
logger.debug('pushedChanges %s %s', r, self.user_id)
def peering(self, action): def peering(self, action):
with db.session(): with db.session():
u = user.models.User.get_or_create(self.user_id) u = user.models.User.get_or_create(self.user_id)