public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-04-13 09:38:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Using proper hostname for task server. Adding verbosity to feed fetching.

Browse source
This commit is contained in:
Samuel Clay 2013-04-03 18:11:23 -07:00
parent 4461bb9c99
commit 7a41b6a949
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/rss_feeds/models.py
View file

@ -808,7 +808,7 @@ class Feed(models.Model):
def add_update_stories(self, stories, existing_stories, verbose=False): def add_update_stories(self, stories, existing_stories, verbose=False):
ret_values = dict(new=0, updated=0, same=0, error=0) ret_values = dict(new=0, updated=0, same=0, error=0)
if settings.DEBUG: if settings.DEBUG or verbose:
logging.debug(" ---> [%-30s] ~FBChecking ~SB%s~SN new/updated against ~SB%s~SN stories" % ( logging.debug(" ---> [%-30s] ~FBChecking ~SB%s~SN new/updated against ~SB%s~SN stories" % (
self.title[:30], self.title[:30],
len(stories), len(stories),
@ -913,6 +913,12 @@ class Feed(models.Model):
ret_values['same'] += 1 ret_values['same'] += 1
# logging.debug("Unchanged story: %s " % story.get('title')) # logging.debug("Unchanged story: %s " % story.get('title'))
if settings.DEBUG or verbose:
logging.debug(" ---> [%-30s] ~FBChecked ~SB%s~SN new/updated: %s" % (
self.title[:30],
len(stories),
ret_values))
return ret_values return ret_values
def update_read_stories_with_new_guid(self, old_story_guid, new_story_guid): def update_read_stories_with_new_guid(self, old_story_guid, new_story_guid):

10
fabfile.py vendored
View file

@ -729,7 +729,7 @@ def downgrade_pil():
# = Setup - DB = # = Setup - DB =
# ============== # ==============
# @parallel @parallel
def setup_db_firewall(): def setup_db_firewall():
ports = [ ports = [
5432, # PostgreSQL 5432, # PostgreSQL
@ -749,8 +749,7 @@ def setup_db_firewall():
env.roledefs['dbdo'] + env.roledefs['dbdo'] +
env.roledefs['dev'] + env.roledefs['dev'] +
env.roledefs['debug'] + env.roledefs['debug'] +
env.roledefs['task'] + env.roledefs['task']):
['199.15.249.101']):
sudo('ufw allow proto tcp from %s to any port %s' % ( sudo('ufw allow proto tcp from %s to any port %s' % (
ip, ip,
','.join(map(str, ports)) ','.join(map(str, ports))
@ -948,7 +947,10 @@ def enable_celery_supervisor(queue=None):
@parallel @parallel
def copy_task_settings(): def copy_task_settings():
if env.host: server_hostname = run('hostname')
if 'task' in server_hostname:
host = server_hostname
elif env.host:
host = env.host.split('.', 2)[0] host = env.host.split('.', 2)[0]
else: else:
host = env.host_string.split('.', 2)[0] host = env.host_string.split('.', 2)[0]