Commit Graph

5560 Commits

Author SHA1 Message Date
David Glasser
44341f4ff9 Merge branch 'sso' into tool-refactoring
Conflicts:
	tools/auth.js
	tools/mongo_runner.js
	tools/tests/test-bundler-npm.js
2014-01-16 10:54:33 -08:00
David Glasser
4f5d114771 Don't call onListen more than once
eg, maybe the replset loses and regains its PRIMARY.

(Manually ported to tool-refactoring from devel.)
2014-01-16 10:43:58 -08:00
David Glasser
aa68610b46 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.

(Manually ported to tool-refactoring from devel.)
2014-01-16 10:42:54 -08:00
David Glasser
1d39c2fb5e 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.

(Manually ported to tool-refactoring from devel.)
2014-01-16 10:36:59 -08:00
David Glasser
ea14611031 Be less encouraging of "meteor run" in production 2014-01-15 14:30:31 -08:00
David Glasser
c124419bd2 Merge branch 'devel' into sso 2014-01-13 20:29:09 -08:00
David Glasser
8699a3af94 Throw if $MONGO_OPLOG_URL is not a replset
`new MongoConnection` can now yield. I can't remember why I thought this
would be a problem when first implementing OplogHandle, and it does not
seem to be from initial testing.
2014-01-13 20:26:51 -08:00
Slava Kim
9c1943c467 Adjust docs to waypoints 2.x and add a delay for deps flush to increase performance on scroll. 2014-01-13 11:51:21 -08:00
Slava Kim
bc736e4695 Upgrade jquery-waypoints to 2.0.3 2014-01-13 11:50:53 -08:00
Emily Stark
4b34feb0a9 Fix tiny comment typo 2014-01-10 16:44:45 -08:00
Emily Stark
d19e1f7b3d Merge remote-tracking branch 'origin/devel' into sso
Conflicts:
	packages/accounts-base/accounts_client.js
release/sso-10
2014-01-10 15:21:05 -08:00
David Glasser
e445a4af6a Changes to how Meteor.settings is filled on Galaxy
(a) Prefer $APP_CONFIG over $METEOR_SETTINGS

(b) Allow $APP_CONFIG's settings field to be a string which we
parse (which will be the default soon)
release/sso-9
2014-01-09 16:57:49 -08:00
David Glasser
0b76997e3d Be careful not to send a null ADMIN_APP env var 2014-01-09 15:17:37 -08:00
Michael Bishop
32768a8c05 typo: http => https 2014-01-09 12:47:14 -08:00
David Glasser
6a399dcaf0 Merge remote-tracking branch 'origin/devel' into sso release/sso-8 2014-01-09 10:09:13 -08:00
Geoff Schmidt
1bf1c094ce First pass on new test harness for command-line tool 2014-01-09 02:47:17 -08:00
Emily Stark
d9d4f2139e Add History.md entry for #1616 fix 2014-01-08 22:24:01 -08:00
Emily Stark
6ca5b987fa Merge branch 'fix-issue-1616' into devel
Fixes #1616
2014-01-08 22:22:13 -08:00
Emily Stark
44629cf800 Avoid overwriting fresh tokens from other tabs.
* Before wiping a bad token from storage on reconnect, make sure that
  we're wiping the token that we tried and failed to log in with. Avoids
  logging out another tab that might have gotten a fresh valid token
  while we were logging in with the old, invalid one (though it is still
  theoretically possible).
* In the logoutOtherClients callback, try to log in with the token that
  we get in the response. Accounts for the situation where the server
  disconnects us before the callback runs.
* If we fail to log in with a token found during a localStorage poll,
  make the client logged out.
* Add a test that attempts to simulate one tab getting a fresh new token
  while another tab logs in with an old invalid token on reconnect.
2014-01-08 22:21:38 -08:00
Emily Stark
56d60907cc Simplify logoutOtherClients and fix onReconnect race.
If we called `login` and then called `logoutOtherClients` before the login
result was recieved, then we would end up with no `onReconnect` callback. Fixed
by just leaving `onReconnect` as it is when calling `logoutOtherClients` -- we
were only replacing `onReconnect` for the sake of tests that have since been
rewritten much more cleanly.

Fixes #1616.
2014-01-08 22:21:38 -08:00
Geoff Schmidt
8b7475a8a6 Detect options that need a value but didn't get one. 2014-01-08 18:14:04 -08:00
Geoff Schmidt
b940e06006 make getSettings report problems cleanly
(using buildmessages rather exceptions)
2014-01-08 17:18:32 -08:00
Sashko Stubailo
1ee8f2aff6 Fix issues with meteorid popup release/sso-7 2014-01-08 17:06:15 -08:00
Sashko Stubailo
bd9e5d8057 Add log warning when there is an error with OAuth 2014-01-08 14:42:01 -08:00
Sashko Stubailo
8d6e2c72e5 Fix typo in callback name in Facebook package 2014-01-08 11:36:09 -08:00
Geoff Schmidt
054ab2da94 Eliminate last process.exit call!
(other than main.js and tests, where it's OK)
2014-01-07 23:50:25 -08:00
Geoff Schmidt
b72a7e2e83 Eliminate the process.exit in library.js 2014-01-07 23:19:32 -08:00
Geoff Schmidt
8bded5c44f eliminate process.exit from release.js and warehouse.js 2014-01-07 22:58:00 -08:00
David Glasser
837f842e7b Fix $type:4 queries and sorts with numeric indices
Add lots of sort tests.  All new tests in this commit have been verified
against MongoDB (2.5).
release/oplog-operators release/oplog-with-operators
2014-01-07 22:53:36 -08:00
David Glasser
6a6df0bff7 Add #594 fix to History 2014-01-07 21:17:36 -08:00
David Glasser
bab936eac9 Patch _.each to not treat {length: 5} as an array
Specifically, in all Underscore "collection" functions which treat their
arguments polymorphically as either "object-like" or "array-like", don't
treat arguments with `x.constructor === Object` as arrays (except for
the 'arguments' object).

Fixes #594. Fixes #1737.
2014-01-07 20:17:47 -08:00
Geoff Schmidt
a1decc47af eliminate process.exit calls in deploy.js 2014-01-07 19:04:48 -08:00
Geoff Schmidt
04b2957670 better error handling in deploy-galaxy.js 2014-01-07 18:52:59 -08:00
David Glasser
1dc7ccee0f Merge branch 'pr/1732' into devel 2014-01-07 17:24:23 -08:00
David Glasser
8a3f24765b Add Oxford comma
http://www.washingtontimes.com/news/2013/dec/11/comma-twitter-erupts-over-obama-castro-marriage/
2014-01-07 17:23:49 -08:00
Maxime Quandalle
c6bea042b7 Update coffeescript.html 2014-01-07 17:23:34 -08:00
David Glasser
53de3f21ba Improve docs for server-to-server collections
Fixes #1723.
2014-01-07 17:15:06 -08:00
David Glasser
ce77adc22e Remove warning about update/$ 2014-01-07 17:00:18 -08:00
Geoff Schmidt
be0a11802d Print progress messages on startup. Fix some bugs. 2014-01-07 16:55:58 -08:00
David Glasser
e9f9ec246f Merge branch 'pr/1711' into devel 2014-01-07 16:34:37 -08:00
David Glasser
cc1d47b5c5 Wording tweak. 2014-01-07 16:34:25 -08:00
Denis Gorbachev
f7c3e7621c Update concepts.html 2014-01-07 16:29:49 -08:00
Geoff Schmidt
a5658ade21 bundler no longer takes a release
(it gets it from the app and from release.current)
2014-01-07 14:46:39 -08:00
Geoff Schmidt
9813345e15 move runMongoShell to appropriate file. fix some bugs. 2014-01-06 23:30:19 -08:00
Geoff Schmidt
f2a1d9c71c rename runner.js to run-all.js
make main.js the entry point rather than meteor.js
2014-01-06 22:42:29 -08:00
Geoff Schmidt
dbe6edf11c read ROOT_URL from environment in commands.js, not runner.js 2014-01-06 22:28:29 -08:00
Geoff Schmidt
4ccfa114c8 read MONGO_URL from environment in commands.js, not run*.js 2014-01-06 22:16:13 -08:00
David Glasser
add4f6e015 Disallow {fields:{_id:0}} in observeChanges
This implies it is not allowed in `observe` either, or in cursors
returned from publish functions, or in cursors used in {{#each}}

Why? observeChanges and DDP publication use the ID as part of the
callback/message, and eliding it completely breaks them. Meteor UI uses
the ID with {{#each}} to properly move nodes around instead of
re-rendering. We could try to allow it for `observe` outside of
{{#each}}, but it would feel somewhat inconsistent.
2014-01-06 21:16:23 -08:00
David Glasser
8800564e80 Use OplogObserveDriver for most selectors.
Previously OplogObserveDriver was only used for selectors which
performed equality checks against scalars. Now that we believe minimongo
to be more robust in the face of more MongoDB edge cases, we use
OplogObserveDriver (if configured) for any selector that minimongo can
compile except those containing $near or $where.

(We still do not use OplogObserveDriver for cursors with skip or limit.)
release/release/oplog-with-operators
2014-01-06 17:02:04 -08:00
Emily Stark
8152969597 Merge remote-tracking branch 'origin/devel' into sso 2014-01-06 15:15:02 -08:00