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

Reducing queue size of push feeds when overloaded.

Browse source
This commit is contained in:
Samuel Clay 2012-12-26 02:41:13 -08:00
parent b57601cb9b
commit 70f2da6218
7 changed files with 137 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/rss_feeds/models.py
View file

@ -1236,13 +1236,17 @@ class Feed(models.Model):
self.save()
def queue_pushed_feed_xml(self, xml):
logging.debug(' ---> [%-30s] [%s] ~FBQueuing pushed stories...' % (unicode(self)[:30], self.pk))
self.queued_date = datetime.datetime.utcnow()
self.set_next_scheduled_update()
PushFeeds.apply_async(args=(self.pk, xml), queue='push_feeds')
r = redis.Redis(connection_pool=settings.REDIS_POOL)
queue_size = r.llen("push_feeds")
if queue_size > 1000:
self.schedule_feed_fetch_immediately()
else:
logging.debug(' ---> [%-30s] [%s] ~FBQueuing pushed stories...' % (unicode(self)[:30], self.pk))
self.queued_date = datetime.datetime.utcnow()
self.set_next_scheduled_update()
PushFeeds.apply_async(args=(self.pk, xml), queue='push_feeds')
# def calculate_collocations_story_content(self,
# collocation_measures=TrigramAssocMeasures,
# collocation_finder=TrigramCollocationFinder):

3
fabfile.py vendored
View file

@ -790,6 +790,9 @@ def setup_task_motd():
def enable_celery_supervisor():
put('config/supervisor_celeryd.conf', '/etc/supervisor/conf.d/celeryd.conf', use_sudo=True)
sudo('supervisorctl reread')
sudo('supervisorctl update')
def copy_task_settings():
with settings(warn_only=True):

13
media/ios/Classes/TrainerViewController.m
View file

@ -31,8 +31,18 @@
self.appDelegate = [NewsBlurAppDelegate sharedAppDelegate];
navBar.tintColor = UIColorFromRGB(0x183353);
[self hideGradientBackground:webView];
}
- (void) hideGradientBackground:(UIView*)theView
{
for (UIView * subview in theView.subviews)
{
if ([subview isKindOfClass:[UIImageView class]])
subview.hidden = YES;
[self hideGradientBackground:subview];
}
}
- (void)viewWillAppear:(BOOL)animated {
[[UIMenuController sharedMenuController]
setMenuItems:[NSArray arrayWithObjects:
@ -46,6 +56,7 @@
NSString *path = [[NSBundle mainBundle] bundlePath];
NSURL *baseURL = [NSURL fileURLWithPath:path];
[self.webView loadHTMLString:[self makeTrainerSections] baseURL:baseURL];
}

8
media/ios/NewsBlur.xcodeproj/xcuserdata/sclay.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
View file

@ -17,15 +17,15 @@
landmarkType = "5">
</FileBreakpoint>
<FileBreakpoint
shouldBeEnabled = "Yes"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Classes/TrainerViewController.m"
timestampString = "378183557.788153"
timestampString = "378184717.887918"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "261"
endingLineNumber = "261"
startingLineNumber = "272"
endingLineNumber = "272"
landmarkName = "-changeTitle:"
landmarkType = "5">
</FileBreakpoint>

66
media/ios/Resources-iPad/Classes/TrainerViewController~ipad.xib
View file

@ -67,19 +67,32 @@
<string key="NSFrame">{{0, 44}, {540, 556}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">10</int>
<object class="NSImage" key="NSImage">
<int key="NSImageFlags">549453824</int>
<string key="NSSize">{256, 256}</string>
<array class="NSMutableArray" key="NSReps">
<array>
<integer value="0"/>
<object class="NSBitmapImageRep">
<object class="NSData" key="NSTIFFRepresentation">
<bytes key="NS.bytes">TU0AKgAEAAh1eIH/cHJ5/3Bzff9vcXX/bnB3/3Byef9vcXX/bG51/2xudf9ucHf/cHN9/2dqdP9ucXv/
<object class="NSColor" key="IBUIBackgroundColor" id="916090526">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIDataDetectorTypes">1</int>
<bool key="IBUIDetectsPhoneNumbers">YES</bool>
</object>
</array>
<string key="NSFrame">{{0, 20}, {540, 600}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="537458422"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">10</int>
<object class="NSImage" key="NSImage">
<int key="NSImageFlags">549453824</int>
<string key="NSSize">{256, 256}</string>
<array class="NSMutableArray" key="NSReps">
<array>
<integer value="0"/>
<object class="NSBitmapImageRep">
<object class="NSData" key="NSTIFFRepresentation">
<bytes key="NS.bytes">TU0AKgAEAAh1eIH/cHJ5/3Bzff9vcXX/bnB3/3Byef9vcXX/bG51/2xudf9ucHf/cHN9/2dqdP9ucXv/
cHJ5/3Bzff9qbHP/b3F1/3N1fP9sbnX/am13/2ptd/9sbnX/am13/3l7gf91d33/bG95/2xudf9sb3n/
bG95/2dqdP9qbXf/c3V8/3Bzff93eoP/bG51/3Bzff9sbnX/dXd9/2dqdP9qbHP/bG51/2psc/9sb3n/
am13/2ptd/9sb3n/bG51/3V3ff97fYP/YmVu/25xe/9sb3n/c3Z//2psc/9zdXz/cHN9/2dqcf9qbHP/
@ -4452,32 +4465,13 @@ cHN9/2xvef9wc33/AA0BAAADAAAAAQEAAAABAQADAAAAAQEAAAABAgADAAAABAAEAKoBAwADAAAAAQAB
AAABBgADAAAAAQACAAABEQAEAAAAAgAEALIBEgADAAAAAQABAAABFQADAAAAAQAEAAABFgADAAAAAQCA
AAABFwAEAAAAAgAEALoBHAADAAAAAQABAAABUgADAAAAAQABAAABUwADAAAABAAEAMIAAAAAAAgACAAI
AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
</object>
</object>
</array>
</array>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
</object>
</object>
<string key="IBUIColorCocoaTouchKeyPath">scrollViewTexturedBackgroundColor</string>
</object>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIDataDetectorTypes">1</int>
<bool key="IBUIDetectsPhoneNumbers">YES</bool>
</object>
</array>
<string key="NSFrame">{{0, 20}, {540, 600}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="537458422"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
<object class="NSColorSpace" key="NSCustomColorSpace">
<int key="NSID">2</int>
</array>
</array>
<reference key="NSColor" ref="916090526"/>
</object>
<string key="IBUIColorCocoaTouchKeyPath">scrollViewTexturedBackgroundColor</string>
</object>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics">
<int key="IBUIStatusBarStyle">2</int>

142
media/ios/Resources-iPhone/TrainerViewController.xib
View file

@ -38,25 +38,62 @@
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIWebView" id="363925848">
<object class="IBUIWebView" id="350659321">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">274</int>
<string key="NSFrame">{{0, 44}, {320, 460}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">10</int>
<object class="NSImage" key="NSImage">
<int key="NSImageFlags">549453824</int>
<string key="NSSize">{256, 256}</string>
<array class="NSMutableArray" key="NSReps">
<array>
<integer value="0"/>
<object class="NSBitmapImageRep">
<object class="NSData" key="NSTIFFRepresentation">
<bytes key="NS.bytes">TU0AKgAEAAh1eIH/cHJ5/3Bzff9vcXX/bnB3/3Byef9vcXX/bG51/2xudf9ucHf/cHN9/2dqdP9ucXv/
<object class="NSColor" key="IBUIBackgroundColor" id="898160549">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIDataDetectorTypes">1</int>
<bool key="IBUIDetectsPhoneNumbers">YES</bool>
</object>
<object class="IBUINavigationBar" id="671003461">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">290</int>
<string key="NSFrameSize">{320, 44}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="350659321"/>
<string key="NSReuseIdentifierKey">_NS:240</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<array key="IBUIItems">
<object class="IBUINavigationItem" id="375442463">
<reference key="IBUINavigationBar" ref="671003461"/>
<string key="IBUITitle"/>
<object class="IBUIBarButtonItem" key="IBUIRightBarButtonItem" id="838831704">
<string key="IBUITitle">Done Training</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<float key="IBUIWidth">50</float>
<int key="IBUIStyle">2</int>
<reference key="IBUINavigationItem" ref="375442463"/>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</array>
</object>
</array>
<string key="NSFrame">{{0, 20}, {320, 504}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="671003461"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">10</int>
<object class="NSImage" key="NSImage">
<int key="NSImageFlags">549453824</int>
<string key="NSSize">{256, 256}</string>
<array class="NSMutableArray" key="NSReps">
<array>
<integer value="0"/>
<object class="NSBitmapImageRep">
<object class="NSData" key="NSTIFFRepresentation">
<bytes key="NS.bytes">TU0AKgAEAAh1eIH/cHJ5/3Bzff9vcXX/bnB3/3Byef9vcXX/bG51/2xudf9ucHf/cHN9/2dqdP9ucXv/
cHJ5/3Bzff9qbHP/b3F1/3N1fP9sbnX/am13/2ptd/9sbnX/am13/3l7gf91d33/bG95/2xudf9sb3n/
bG95/2dqdP9qbXf/c3V8/3Bzff93eoP/bG51/3Bzff9sbnX/dXd9/2dqdP9qbHP/bG51/2psc/9sb3n/
am13/2ptd/9sb3n/bG51/3V3ff97fYP/YmVu/25xe/9sb3n/c3Z//2psc/9zdXz/cHN9/2dqcf9qbHP/
@ -4429,56 +4466,13 @@ cHN9/2xvef9wc33/AA0BAAADAAAAAQEAAAABAQADAAAAAQEAAAABAgADAAAABAAEAKoBAwADAAAAAQAB
AAABBgADAAAAAQACAAABEQAEAAAAAgAEALIBEgADAAAAAQABAAABFQADAAAAAQAEAAABFgADAAAAAQCA
AAABFwAEAAAAAgAEALoBHAADAAAAAQABAAABUgADAAAAAQABAAABUwADAAAABAAEAMIAAAAAAAgACAAI
AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
</object>
</object>
</array>
</array>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
</object>
</object>
<string key="IBUIColorCocoaTouchKeyPath">scrollViewTexturedBackgroundColor</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIDataDetectorTypes">1</int>
<bool key="IBUIDetectsPhoneNumbers">YES</bool>
</object>
<object class="IBUINavigationBar" id="908143123">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">290</int>
<string key="NSFrameSize">{320, 44}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="363925848"/>
<string key="NSReuseIdentifierKey">_NS:240</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<array key="IBUIItems">
<object class="IBUINavigationItem" id="188181603">
<reference key="IBUINavigationBar" ref="908143123"/>
<string key="IBUITitle"/>
<object class="IBUIBarButtonItem" key="IBUIRightBarButtonItem" id="156989908">
<string key="IBUITitle">Done Training</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<float key="IBUIWidth">50</float>
<int key="IBUIStyle">2</int>
<reference key="IBUINavigationItem" ref="188181603"/>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</array>
</array>
<reference key="NSColor" ref="898160549"/>
</object>
</array>
<string key="NSFrame">{{0, 20}, {320, 504}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="908143123"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
<object class="NSColorSpace" key="NSCustomColorSpace">
<int key="NSID">2</int>
</object>
<string key="IBUIColorCocoaTouchKeyPath">scrollViewTexturedBackgroundColor</string>
</object>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
<object class="IBUISimulatedSizeMetrics" key="IBUISimulatedDestinationMetrics">
@ -4494,7 +4488,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">webView</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="363925848"/>
<reference key="destination" ref="350659321"/>
</object>
<int key="connectionID">13</int>
</object>
@ -4510,14 +4504,14 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">navBar</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="908143123"/>
<reference key="destination" ref="671003461"/>
</object>
<int key="connectionID">20</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="363925848"/>
<reference key="source" ref="350659321"/>
<reference key="destination" ref="372490531"/>
</object>
<int key="connectionID">12</int>
@ -4525,7 +4519,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">doCloseDialog:</string>
<reference key="source" ref="156989908"/>
<reference key="source" ref="838831704"/>
<reference key="destination" ref="372490531"/>
</object>
<int key="connectionID">19</int>
@ -4543,8 +4537,8 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<int key="objectID">1</int>
<reference key="object" ref="191373211"/>
<array class="NSMutableArray" key="children">
<reference ref="363925848"/>
<reference ref="908143123"/>
<reference ref="350659321"/>
<reference ref="671003461"/>
</array>
<reference key="parent" ref="0"/>
</object>
@ -4561,30 +4555,30 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
</object>
<object class="IBObjectRecord">
<int key="objectID">3</int>
<reference key="object" ref="363925848"/>
<reference key="object" ref="350659321"/>
<array class="NSMutableArray" key="children"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">15</int>
<reference key="object" ref="908143123"/>
<reference key="object" ref="671003461"/>
<array class="NSMutableArray" key="children">
<reference ref="188181603"/>
<reference ref="375442463"/>
</array>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">16</int>
<reference key="object" ref="188181603"/>
<reference key="object" ref="375442463"/>
<array class="NSMutableArray" key="children">
<reference ref="156989908"/>
<reference ref="838831704"/>
</array>
<reference key="parent" ref="908143123"/>
<reference key="parent" ref="671003461"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">17</int>
<reference key="object" ref="156989908"/>
<reference key="parent" ref="188181603"/>
<reference key="object" ref="838831704"/>
<reference key="parent" ref="375442463"/>
</object>
</array>
</object>

12
media/ios/static/trainer.css
View file

@ -2,6 +2,7 @@
margin: 0;
padding: 0;
font-family: "Lucida Grande", Helvetica;
background-color: transparent;
}
.NB-trainer {
@ -9,7 +10,6 @@
}
.NB-trainer-section {
overflow: hidden;
font-size: 13px;
-webkit-text-size-adjust: none;
@ -18,6 +18,15 @@
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
.NB-trainer-section-inner {
margin: 16px 0 0;
overflow: hidden;
box-shadow: 0 0 8px rgba(0, 0, 0, .6);
}
.NB-trainer-publisher .NB-trainer-section-inner {
margin-bottom: 16px;
}
.NB-trainer-section-title {
font-size: 15px;
text-transform: uppercase;
@ -41,7 +50,6 @@
overflow: hidden;
background-color: #F0F0FF;
border-bottom: 1px solid #D0D0D9;
margin: 0 0 16px;
}
.NB-trainer-title .NB-title-trainer {