Permalink
Browse files

Small glitches: statistics showing Not Active on load, maintenace mes…

…sage, turning off ssl for pgsql.
  • Loading branch information...
1 parent 6dbc930 commit 4bcf0751cf6323a8b5b3e8c2ff0efd6dd9374242 @samuelclay committed Jul 7, 2012
Showing with 7 additions and 4 deletions.
  1. +1 −1 config/postgresql.conf
  2. +1 −1 fabfile.py
  3. +3 −2 media/js/newsblur/reader/reader_statistics.js
  4. +2 −0 media/maintenance.html.unused
View
@@ -77,7 +77,7 @@ unix_socket_directory = '/var/run/postgresql' # (change requires restart)
# - Security and Authentication -
#authentication_timeout = 1min # 1s-600s
-ssl = true # (change requires restart)
+ssl = false # (change requires restart)
#ssl_ciphers = 'ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH' # allowed SSL ciphers
# (change requires restart)
#ssl_renegotiation_limit = 512MB # amount of data between renegotiations
View
@@ -534,7 +534,7 @@ def copy_certificates():
put('config/certificates/comodo/newsblur.com.key', '%s/config/certificates/' % env.NEWSBLUR_PATH)
def maintenance_on():
- put('media/maintenance.html.unsused', '%s/media/maintenance.html.unsused' % env.NEWSBLUR_PATH)
+ put('media/maintenance.html.unused', '%s/media/maintenance.html.unused' % env.NEWSBLUR_PATH)
with cd(env.NEWSBLUR_PATH):
run('mv media/maintenance.html.unused media/maintenance.html')
@@ -50,7 +50,8 @@ _.extend(NEWSBLUR.ReaderStatistics.prototype, {
var $stats = this.make_stats({
'last_update': '',
- 'next_update': ''
+ 'next_update': '',
+ 'loading': true
});
$('.NB-modal-statistics-info', this.$modal).replaceWith($stats);
},
@@ -100,7 +101,7 @@ _.extend(NEWSBLUR.ReaderStatistics.prototype, {
$.make('div', { className: 'NB-statistics-update'}, [
$.make('div', { className: 'NB-statistics-label' }, 'Next Update'),
(data.active && $.make('div', { className: 'NB-statistics-count' }, ' ' + (data['next_update'] && ('in ' + data['next_update'])))),
- (!data.active && $.make('div', { className: 'NB-statistics-count' }, "Not active"))
+ (!data.active && !data.loading && $.make('div', { className: 'NB-statistics-count' }, "Not active"))
]),
(!NEWSBLUR.Globals.is_premium && $.make('div', { className: 'NB-statistics-premium-stats' }, [
$.make('div', { className: 'NB-statistics-update'}, [
@@ -11,5 +11,7 @@
<p>Upgrading PostgreSQL. It's Friday night (really, Saturday morning) at 12:20am. No more than 30 minutes. As little as 5 minutes.</p>
+<p><b>UPDATE 12:57am</b>: OK, I lied. Turns out it took 30 minutes just to get the upgrade *started*. If you've ever upgraded postgresql, you know what a pain in the butt this can be. But it's going and now I'm just writing up maintenance posts for only a few dozen people to see. Go bother <a href="http://twitter.com/samuelclay">@samuelclay</a> for the next 10-15 minutes. :-)</p>
+
</body>
</html>

0 comments on commit 4bcf075

Please sign in to comment.