Skip to content

Commit 4ae80df

Browse files
committed
minor fixes
1 parent c1f85cb commit 4ae80df

4 files changed

Lines changed: 27 additions & 14 deletions

File tree

bin/server

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ co(function*() {
99

1010
yield* app.waitBootAndListen(config.server.host, config.server.port);
1111

12-
console.log("app is listening");
12+
log.info("app is listening");
1313

1414
}).catch(function(err) {
1515
throw err;
@@ -21,24 +21,26 @@ process.on('message', function(msg) {
2121
}
2222
});
2323

24+
2425
function shutdown() {
2526
// The process is going to be reloaded
2627
// Have to close all database/socket.io/* connections
2728

2829
co(function*() {
29-
console.log("Closing the app...");
30+
log.info("closing the app...");
3031
yield* app.close();
31-
console.log("App closed");
32+
log.info("app closed");
3233
}).then(function() {
34+
log.info("exiting");
3335
process.exit(0);
3436
}, function(err) {
35-
console.error(err);
37+
log.error(err);
3638
});
3739

3840
var dieDelay = process.env.PM2_GRACEFUL_TIMEOUT || 4000;
3941
// I have 4000ms to close all connections
4042
setTimeout(function() {
41-
console.error("App is stopping for too long! Will be killed now!");
43+
log.error("App is stopping for too long! Will be killed now!");
4244
// kill is accomplished by PM2
4345
}, dieDelay - 100);
4446

client/head/index.js

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,21 @@ require('styles');
33

44
require('client/polyfill');
55

6+
try {
7+
window.localStorage.testProperty = 1;
8+
delete window.localStorage.testProperty;
9+
} catch(e) {
10+
// localStorage disabled or forbidden
11+
try {
12+
window.localStorage = {};
13+
// so that operations on it won't fail
14+
} catch(e) {
15+
/* can happen TypeError: Attempted to assign to readonly property. */
16+
}
17+
}
18+
619
if (!window.localStorage) { // disabled
7-
window.localStorage = {};
20+
821
}
922

1023
require('./unready');

handlers/nodejsScreencast/templates/index.jade

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
extends /layouts/main
22

33
block append variables
4-
- var headTitle = 'Современный учебник Javascript';
5-
6-
//- layout
4+
- var headTitle = 'Скринкаст по Node.JS';
75
- var sitetoolbar = true
86
- var header = true
97
- var layout_page_class = "page_contains_header"

templates/blocks/comments.jade

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
ul
1010
li Приветствуются комментарии, содержащие дополнения и вопросы по статье, и ответы на них.
1111
li
12-
| Для кода внутри строки используйте тег <code>&lt;code&gt;</code>,
13-
| для блока кода&nbsp;&mdash; тег <code>&lt;pre&gt;</code>,
12+
| Для одной строки кода используйте тег <code>&lt;code&gt;</code>,
13+
| для нескольких строк кода&nbsp;&mdash; тег <code>&lt;pre&gt;</code>,
1414
| если больше 10 строк&nbsp;&mdash; ссылку на песочницу (<a href="http://plnkr.co/edit/?p=preview">plnkr</a>, <a href="http://jsfiddle.net">jsfiddle</a>, <a href="http://codepen.io">codepen</a>...).
15-
li Если что-то непонятно&nbsp;&mdash; пишите, что именно и с какого места.
15+
li Если что-то непонятно в статье&nbsp;&mdash; пишите, что именно и с какого места.
1616

1717

1818
#disqus_thread
@@ -22,5 +22,5 @@ script.
2222
var disqus_shortname = 'learnjavascriptru';
2323
var disqus_identifier = location.pathname;
2424

25-
script(async src = '//learnjavascriptru.disqus.com/embed.js')
26-
script(async src = '//learnjavascriptru.disqus.com/count.js')
25+
script(async src='//learnjavascriptru.disqus.com/embed.js')
26+
script(async src='//learnjavascriptru.disqus.com/count.js')

0 commit comments

Comments
 (0)