Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

One click update in two parts so new code is loaded for second. #15770

Merged
merged 2 commits into from Apr 16, 2020

Conversation

diosmosis
Copy link
Member

No description provided.

@diosmosis diosmosis added this to the 3.13.5 milestone Apr 2, 2020
@diosmosis diosmosis added the Needs Review PRs that need a code review label Apr 8, 2020
@@ -172,6 +173,17 @@ public function oneClickUpdate()
return $view->render();
}

public function oneClickUpdatePartTwo()
{
Piwik::checkUserHasSuperUserAccess();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wondering what happens if user was just logged out in between this step and the previous? Eg maybe because of what we noticed in https://github.com/matomo-org/matomo/pull/15755/files#r405990135 ?

I guess otherwise it's pretty much unlikely that a cookie would expire just between those two requests as we extend the cookie on every request by 30 min AFAIK and previous step shouldn't take more than 30min.

I suppose we would notice such an issue in the one click updater test so things should be all good 👍

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely want to test w/ the release candidate, regardless.

@sgiehl
Copy link
Member

sgiehl commented Apr 16, 2020

@diosmosis code looks good now I guess. Shall we merge, or do you want to do some more testing before?

@diosmosis
Copy link
Member Author

Needs to be merged and in an RC before we can do a final test, so I'll just merge it.

@diosmosis diosmosis merged commit 934ad5a into 3.x-dev Apr 16, 2020
@diosmosis diosmosis deleted the one-click-update branch April 16, 2020 18:24
diosmosis added a commit that referenced this pull request Apr 16, 2020
* Avoid possible error subtable already exists but not loaded (#15779)

* Make sure to always set JSON_PIWIK to native JSON when possible (#15785)

* make sure to always set JSON_PIWIK to native JSON when possible

* rebuilt piwik.js

* Force POST for bulk requests, fix alwaysUseSendBeacon not respected for bulk requests (#15784)

* Force POST for bulk requests, fix alwaysUseSendBeacon not respected for bulk requests

* rebuilt piwik.js

* Make sure to clean up tracking failures before sending email notification (#15798)

Feedback from a customer... Eg the daily `cleanupTrackingFailures()` action might be only executed after the weekly `notifyTrackingFailures` therefore we should try to clean up failures first and then check if any are left. Avoids the case where a user opens hours later the email they receive and then there are no tracking failures reported. This could still happen but it's a bit less likely.

* 3.13.5-b1

* Faster segmented suggested values when browser archiving is disabled (#15786)

* Faster segmented suggested values when browser archiving is disabled

* make sure no segment is set

* remove wrong var type

* fix/add tests

* add more segment values

* detect if we should flatten or not

* add docs

* Fix problem when comparing segments or opening popovers (#15809)

refs #15805

* purge all old archives regardless of done value (#15800)

* purge all old archives regardless of done value, we only care about the newest usable one

* Fix test and start on new one.

* Add coverage for change in tests.

* there is no longer an inner join so should not need the idsite check

* Add more parameters to the computeNbUnique event (#15808)

* 3.13.5-b2

* One click update in two parts so new code is loaded for second. (#15770)

* One click update in two parts so new code is loaded for second.

* remove no longer needed code

Co-authored-by: Thomas Steur <tsteur@users.noreply.github.com>
Co-authored-by: Matthieu Aubry <mattab@users.noreply.github.com>
Co-authored-by: Stefan Giehl <stefan@matomo.org>
mattab added a commit that referenced this pull request Apr 28, 2020
to test the auto updater after #15770
tsteur added a commit that referenced this pull request Aug 18, 2020
Seems to have regressed in #15770

Haven't tested it yet but this should work. We'll then also need to fix this in Matomo 4 separately because the token_auth check wouldn't work there because it would check against the new app specific token auth table which wouldn't exist yet at the time this is executed.
jonasgrilleres pushed a commit to 1024pix/pix-analytics that referenced this pull request Sep 22, 2020
…mo-org#15770)

* One click update in two parts so new code is loaded for second.

* remove no longer needed code
jonasgrilleres pushed a commit to 1024pix/pix-analytics that referenced this pull request Sep 22, 2020
to test the auto updater after matomo-org#15770
jbuget pushed a commit to 1024pix/pix-analytics that referenced this pull request Sep 26, 2020
…mo-org#15770)

* One click update in two parts so new code is loaded for second.

* remove no longer needed code
jbuget pushed a commit to 1024pix/pix-analytics that referenced this pull request Sep 26, 2020
to test the auto updater after matomo-org#15770
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Needs Review PRs that need a code review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants