Commit Graph

700 Commits

Author SHA1 Message Date
Slava Kim
ceea2a1cf2 Pull all imports with css-parse 2014-02-03 21:58:26 -08:00
Geoff Schmidt
9318b4c250 Fix misunderstanding of kexec arguments 2014-01-30 11:05:22 -08:00
David Glasser
a3b7213247 Clean up #1774 2014-01-29 14:39:35 -08:00
Marc-Andre Lafortune
5cfe47e1f6 Document 'where' parameter for packages 2014-01-29 14:39:35 -08:00
David Glasser
3104ddb6e5 Style change to skel to match shark. 2014-01-27 14:17:31 -08:00
David Glasser
8f4963ecd2 Use new exec 2014-01-27 13:52:54 -08:00
David Glasser
97ec2d3948 Update to newer http-proxy API
Take out workaround that's been incorporated into the branch we're using
2014-01-23 14:40:21 -08:00
David Glasser
a7d10d650d Update Node to 0.10.25. Remove bug workaround. 2014-01-23 12:15:29 -08:00
David Glasser
16b23ecb38 Close proxy/server websockets on client errors
Previously, certain errors on the client/proxy socket would result in
the proxy keeping the websocket to the server open forever rather than
closing it.  For example, disconnecting the client from the internet
without a graceful shutdown. This could easily be reproduced with any
app using `facts`, eg https://github.com/tarangp/test-observers.
Run the app, connect locally with one browser, connect from a second
computer, observe sessions going to 2, disconnect the second computer.
With this commit, sessions will go back to 1 in about a minute. Without
it, it never will.

This particular fix is not very compelling, since it uses undocumented
features of the stream interface. I will file an issue with the
node-http-proxy project tonight asking how we're supposed to do this.

This addresses #1769.  I'll close that once we have a more compelling
fix, and once the similar bug is fixed in the proxies used in the
`meteor deploy` server and in Galaxy.
2014-01-21 18:17:08 -08:00
David Glasser
178734b66d Fix test broken by 0f4a21f (thanks @awwx). 2013-12-23 15:17:36 -08:00
David Glasser
7341966f49 Fix incorrect Node version number
Fixes #1701
2013-12-20 14:34:06 -08:00
David Glasser
36bad38aa0 Merge branch 'master' into devel
Conflicts:
	tools/mongo_runner.js
2013-12-20 14:26:27 -08:00
David Glasser
d98b7ed423 Don't call onListen more than once
eg, maybe the replset loses and regains its PRIMARY.
2013-12-20 13:51:29 -08:00
David Glasser
96c9076544 Don't leave invalid METEOR-PORT files around
Could cause mongo startup to hang.

Reproduction:

  $ meteor
  => Meteor server running on: http://localhost:3000/
  # ... wait for server to start, ctrl-c.
  # leaves '3002' in .meteor/local/db/METEOR-PORT
  $ meteor -p 5000
  # ctrl-c in about a second: once we've wiped the old local db
  # but before we've configured the new one.
  # before this commit, '3002' is still in the METEOR-PORT file.
  $ meteor
  # before this commit, hangs with:
  Initializing mongo database... this may take a moment.
2013-12-20 13:51:28 -08:00
David Glasser
995d728278 mongo_runner: Don't send rs.initiate too early
Fixes #1696. Thanks to @Maxpain177 for reporting and providing access to
a machine where this was easily reproducible.
2013-12-20 13:51:28 -08:00
David Glasser
c0626667ec Don't leave invalid METEOR-PORT files around
Could cause mongo startup to hang.

Reproduction:

  $ meteor
  => Meteor server running on: http://localhost:3000/
  # ... wait for server to start, ctrl-c.
  # leaves '3002' in .meteor/local/db/METEOR-PORT
  $ meteor -p 5000
  # ctrl-c in about a second: once we've wiped the old local db
  # but before we've configured the new one.
  # before this commit, '3002' is still in the METEOR-PORT file.
  $ meteor
  # before this commit, hangs with:
  Initializing mongo database... this may take a moment.
2013-12-19 18:21:20 -08:00
David Glasser
7424bb63cd mongo_runner: Don't send rs.initiate too early
Fixes #1696. Thanks to @Maxpain177 for reporting and providing access to
a machine where this was easily reproducible.
2013-12-19 17:49:53 -08:00
David Glasser
0f4a21f89f meteor_npm: don't lose interesting resolved
If an indirect dependency resolves to something other than a semver (or
a GitHub tarball), it will be stored in the 'resolved'. Our shrinkwrap
minifier (which helps to reduce spurious shrinkwrap file changes) needs
to recognize that.

Also, consistently use the "version" field in the minified shrinkwrap
file (which a comment already claimed we could do).

Fixes #1684.
2013-12-17 19:05:25 -08:00
David Glasser
ebb729f0f6 Fix crash with an empty programs/foo dir
We should never use the existence of a directory in our source tree to
make a decision, because git doesn't track directory existence, and it's
easy to end up with extraneous directories (containing gitignored files,
eg).  So we should ignore programs/foo directories in apps if they don't
contain package.js.
2013-12-17 18:35:31 -08:00
Nick Martin
9dfa0ee95f Update tools tests for Webapp bundled asset change 6eccf8c 2013-12-15 17:17:41 -08:00
ekatek
4ab6f8ee88 tags 2013-12-13 10:03:35 -08:00
Naomi Seyfer
276034617a First version of a reload safetybelt against javascript or css not being loaded properly 2013-12-13 10:03:35 -08:00
ekatek
7da8004ddf version as tag 2013-12-13 10:03:35 -08:00
Nick Martin
04fddf3a77 Update tools tests for Webapp bundled asset change 6eccf8c 2013-12-11 20:38:51 -08:00
David Glasser
8de5ebfc6f Become able to kill mongod spawned by pre-oplog branches 2013-12-11 17:04:06 -08:00
Nick Martin
89ec9ddf62 Up timeout for printing mongo message. This way it doesn't happen normally during cold start (3--4 sec). 2013-12-10 22:13:12 -08:00
David Glasser
b4c14af032 Fix find_mongo_pids regexp
Also add some comments to mongod options.
2013-12-10 19:09:41 -08:00
Nick Martin
f9b394de4f Use smaller oplog (8MB instead of 256MB default).
This uses less space on disk and starts up faster. It might mean
people hit the end of the oplog if the server gets really slow.
But, hey, then we can debug and test more oplog error modes.
2013-12-10 17:47:49 -08:00
Nick Martin
1b08ac2d9d Upgrade to stock Node 0.10.22.
This discards our fix for stream pausing. We'll monkey patch it in
at startup instead of relying on a custom build.
2013-12-10 15:27:40 -08:00
David Glasser
d16cd33242 Improve bundler comment 2013-12-06 13:38:51 -08:00
Emily Stark
6eccf8cbbb Add an optional prefix for bundled js and css files.
Set it with `WebAppInternals.setBundledJsCssPrefix(prefix)`.
2013-12-05 17:52:35 -08:00
David Glasser
593d980ba6 implement 'test-packages --disable-oplog' 2013-12-04 12:54:27 -08:00
David Glasser
e9e39d2cb2 Rename $OPLOG_URL to $MONGO_OPLOG_URL 2013-12-02 19:17:39 -08:00
Nick Martin
5f1b721823 Fix meteor run to look at the OPLOG_URL environment variable. 2013-12-02 19:17:36 -08:00
Slava Kim
008c74df4b OPLOG_URL is accessed only by appConfig. 2013-12-02 19:17:35 -08:00
David Glasser
b4a598b3e5 Close connection to DB used to set up oplog. 2013-12-02 19:17:33 -08:00
David Glasser
0ddf232773 Restore accidentally-deleted mongo restart code.
Thanks, cli-test.sh!
2013-12-02 19:17:31 -08:00
David Glasser
7f85f38110 Change repl set name from dummy to meteor.
This name ends up in the "meteor mongo" prompt, and a prompt of "dummy:PRIMARY>"
is way less welcoming than "meteor:PRIMARY>".
2013-12-02 19:17:28 -08:00
David Glasser
40befb8023 minor improvements 2013-12-02 19:17:28 -08:00
David Glasser
123c06ac3f oplog checkpoint from friday 2013-12-02 19:17:24 -08:00
David Glasser
6637656261 Don't reset the replset unless the port changes.
(Resetting the replset is slow!)
2013-12-02 19:17:24 -08:00
David Glasser
878dfe9a1f In "meteor run", run mongo in repl-set mode, so that oplog is available.
Note: this is pretty slow. Before merging this branch, should cache the fact
that replset has been initiated on port N so that on the next run, if the port
hasn't changed, we don't need to re-initiate.
2013-12-02 19:17:24 -08:00
David Glasser
e11228a3f8 Clean up package dirs containing only ".build"
These directories are often left around when switching from another
branch; git does not delete the gitignored .build directory (but it will
show up annoyingly in 'git status').
2013-12-02 17:50:30 -08:00
David Glasser
8ab66ff255 Stop using handlebars in the bundler.
The dev bundle contains a copy of the handlebars NPM module solely for
creating app.html.  This is separate from the NPM module used by the
handlebars NPM package.

On the shark branch, we no longer use the handlebars NPM module for
Meteor template (it is being replaced by Spacebars), so in preparation
for that, we'll remove this barely-used build-time dependency on
handlebars.

A subsequent commit will remove it from the dev bundle.

Once the Spacebars API has fully settled (eg, it has been merged to
devel), we should get rid of this ad hoc templating and replace it with
Spacebars, either in webapp_server (driven entirely by program.json) or
by using unipackage.load in bundler.
2013-12-02 17:15:37 -08:00
David Glasser
c066b90e1c Add comment referencing #1648 2013-12-02 16:59:50 -08:00
David Glasser
b2b5e323eb set x-forwarded-* headers in 'meteor run'
This was a regression in 0.6.6 when we upgraded to a new unreleased
version of http-proxy which now requires an explicit option to set them.
See #1624.
2013-11-25 17:16:57 -08:00
Alexey Komissarouk
60f88dcc0f asking for password on stdout so url can be used in scripts 2013-11-18 17:03:41 -08:00
Naomi Seyfer
3e2fde9cbe Merge branch 'devel' into follower 2013-11-07 16:22:35 -08:00
Emily Stark
8d7a3f6591 Include release stamp in star.json 2013-11-04 22:09:45 -08:00
Slava Kim
ac376b6db8 Introduce '--raw-logs' option to meteor run to disable logs parsing. 2013-11-03 22:09:17 -08:00