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

CRM-18251 - Domain stats and VersionCheck #8525

Merged
merged 1 commit into from
Mar 29, 2017

Conversation

twomice
Copy link
Contributor

@twomice twomice commented Jun 7, 2016

@twomice
Copy link
Contributor Author

twomice commented Jun 7, 2016

Jenikins retest this please.

@twomice
Copy link
Contributor Author

twomice commented Jun 7, 2016

@nganivet Can you review this please? Thanks!

$this->stats['domain_country_iso'] = $country_result['iso_code'];
}
}
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we explicitly:
} else {
$this->stats['domain_country_iso'] = NULL; (or '';)
}
??

@totten totten changed the title Fix CRM-18251 CRM-18251 - Domain stats and VersionCheck Jun 11, 2016
@JoeMurray
Copy link
Contributor

Heh Allen as Release Manager this month, I'm trying to recruit people to help pare down the backlog of almost 100 PRs, some going back to last summer. I'm wondering if you would be able to help QA another PR if I got someone to QA this PR?

@twomice
Copy link
Contributor Author

twomice commented Jun 13, 2016

Yes, sure. But note that this PR is not ready, per Nicola's review comment above, so we don't want to review it yet, not until tomorrow when I should have this fixed.

@twomice
Copy link
Contributor Author

twomice commented Jun 16, 2016

Jenikins retest this please.

@twomice
Copy link
Contributor Author

twomice commented Jun 17, 2016

jenkins, test this please

2 similar comments
@totten
Copy link
Member

totten commented Jun 17, 2016

jenkins, test this please

@twomice
Copy link
Contributor Author

twomice commented Jun 17, 2016

jenkins, test this please

@nganivet
Copy link
Contributor

@twomice: can you send a test ping from one of your instances and I will check that all params are received? I have just checked in the stats DB and there does not seem to be any values for either the country ISO or the Delivered entity.

@twomice
Copy link
Contributor Author

twomice commented Jun 20, 2016

@nganivet OK, I've done that now. This site reported domain_isoCode = 'AF'.

@twomice
Copy link
Contributor Author

twomice commented Jul 12, 2016

Jenins retest this please

@eileenmcnaughton
Copy link
Contributor

Just a quick note that we are nearly to the end of review for this cycle - looks like it's almost in but you probably need to merge it tomorrow to make 4.7.10.

But if you 'just miss it' I think it's Ok to merge when done rather than wait for next review week as review is actively happening here

@eileenmcnaughton
Copy link
Contributor

I'm setting the JIRA to 'Unscheduled' - please set the fix version when this is ready for review

@twomice
Copy link
Contributor Author

twomice commented Jul 26, 2016

@nganivet I think this is ready for review; can you comment?

@nganivet
Copy link
Contributor

Alan - we need to test this before it is released. Please tell me a time
you would be available in the short term, we need around 30 mins: you
install this PR on one of your instances and trigger a pingback, I can then
check that all is good on my end. If there are errors client or server side
we can correct and re-test.

On Mon, Jul 25, 2016 at 6:42 PM, twomice notifications@github.com wrote:

@nganivet https://github.com/nganivet I think this is ready for review;
can you comment?


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#8525 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/ADRqOzLgNqev0FWRiCnUD7TmyeyKlXlOks5qZVfrgaJpZM4Ivrj-
.

Nicolas Ganivet | Principal | nicolas@cividesk.com
cividesk | +1 (866) 670-7165 | www.cividesk.com

@twomice
Copy link
Contributor Author

twomice commented Jul 26, 2016

I did that back on June 19 (see #8525 (comment)). Perhaps you can check that? @nganivet

@colemanw
Copy link
Member

@nganivet should have cornered you and @twomice to finish this at the sprint. Still not too late for you to take a look at it though. I'd appreciate it if you can.

@nganivet
Copy link
Contributor

I looked at the Sprint and the tests did not make it to the pingback database. not sure if this is client side or server side though. I have asked @twomice to dump the data sent client-side so I can have a test data set to check on the server-side side.

@twomice
Copy link
Contributor Author

twomice commented Oct 2, 2016

Thanks for the reminder @nganivet . I've run the version_check scheduled job (just now, Oct 1, 2016, 8:12pm Central time) on my dev site, and here's what it should have sent (note "domain_isoCode=TM"):

version=4.7.9&hash=9a8278ea6fa26a053352bdf1e2ad3e2a&uf=Drupal&lang=en_US&co=1228&ufv=7.42-dev&PHP=5.6.4-4ubuntu6.4&MySQL=5.6.28-0ubuntu0.15.04.1&communityMessagesUrl=%2Adefault%2A&domain_isoCode=TM&PPTypes=Elavon+Payment+Processor&entities%5B0%5D%5Bname%5D=Activity&entities%5B0%5D%5Bsize%5D=623&entities%5B1%5D%5Bname%5D=Case&entities%5B1%5D%5Bsize%5D=0&entities%5B2%5D%5Bname%5D=Contact&entities%5B2%5D%5Bsize%5D=202&entities%5B3%5D%5Bname%5D=Relationship&entities%5B3%5D%5Bsize%5D=215&entities%5B4%5D%5Bname%5D=Campaign&entities%5B4%5D%5Bsize%5D=0&entities%5B5%5D%5Bname%5D=Contribution&entities%5B5%5D%5Bsize%5D=93&entities%5B6%5D%5Bname%5D=ContributionPage&entities%5B6%5D%5Bsize%5D=3&entities%5B7%5D%5Bname%5D=ContributionProduct&entities%5B7%5D%5Bsize%5D=0&entities%5B8%5D%5Bname%5D=Widget&entities%5B8%5D%5Bsize%5D=0&entities%5B9%5D%5Bname%5D=Discount&entities%5B9%5D%5Bsize%5D=0&entities%5B10%5D%5Bname%5D=PriceSetEntity&entities%5B10%5D%5Bsize%5D=6&entities%5B11%5D%5Bname%5D=UFGroup&entities%5B11%5D%5Bsize%5D=13&entities%5B12%5D%5Bname%5D=Event&entities%5B12%5D%5Bsize%5D=6&entities%5B13%5D%5Bname%5D=Participant&entities%5B13%5D%5Bsize%5D=50&entities%5B14%5D%5Bname%5D=Friend&entities%5B14%5D%5Bsize%5D=8&entities%5B15%5D%5Bname%5D=Grant&entities%5B15%5D%5Bsize%5D=0&entities%5B16%5D%5Bname%5D=Mailing&entities%5B16%5D%5Bsize%5D=0&entities%5B17%5D%5Bname%5D=Membership&entities%5B17%5D%5Bsize%5D=30&entities%5B18%5D%5Bname%5D=MembershipBlock&entities%5B18%5D%5Bsize%5D=1&entities%5B19%5D%5Bname%5D=Pledge&entities%5B19%5D%5Bsize%5D=3&entities%5B20%5D%5Bname%5D=PledgeBlock&entities%5B20%5D%5Bsize%5D=2&entities%5B21%5D%5Bname%5D=Delivered&entities%5B21%5D%5Bsize%5D=0&extensions%5B0%5D%5Bname%5D=org.civicrm.component.civievent&extensions%5B0%5D%5Benabled%5D=1&extensions%5B0%5D%5Bversion%5D=4.7.9&extensions%5B1%5D%5Bname%5D=org.civicrm.component.civicontribute&extensions%5B1%5D%5Benabled%5D=1&extensions%5B1%5D%5Bversion%5D=4.7.9&extensions%5B2%5D%5Bname%5D=org.civicrm.component.civimember&extensions%5B2%5D%5Benabled%5D=1&extensions%5B2%5D%5Bversion%5D=4.7.9&extensions%5B3%5D%5Bname%5D=org.civicrm.component.civimail&extensions%5B3%5D%5Benabled%5D=1&extensions%5B3%5D%5Bversion%5D=4.7.9&extensions%5B4%5D%5Bname%5D=org.civicrm.component.civireport&extensions%5B4%5D%5Benabled%5D=1&extensions%5B4%5D%5Bversion%5D=4.7.9&extensions%5B5%5D%5Bname%5D=org.civicrm.component.civipledge&extensions%5B5%5D%5Benabled%5D=1&extensions%5B5%5D%5Bversion%5D=4.7.9

This appears to have reached the remote server properly, as it returned this JSON string: {"4.7":{"status":"stable","releases":[{"version":"4.7.alpha1","date":"2015-09-23"},{"version":"4.7.alpha2","date":"2015-09-30"},{"version":"4.7.alpha3","date":"2015-10-07"},{"version":"4.7.alpha4","date":"2015-10-14"},{"version":"4.7.alpha5","date":"2015-10-21"},{"version":"4.7.beta1","date":"2015-12-03"},{"version":"4.7.beta2","date":"2015-12-09"},{"version":"4.7.beta3","date":"2015-12-15"},{"version":"4.7.beta4","date":"2015-12-23"},{"version":"4.7.beta5","date":"2015-12-30"},{"version":"4.7.beta6","date":"2016-01-06"},{"version":"4.7.beta7","date":"2016-01-12"},{"version":"4.7.beta8","date":"2016-01-20"},{"version":"4.7.0","date":"2016-01-27"},{"version":"4.7.1","date":"2016-02-03","security":"true"},{"version":"4.7.2","date":"2016-02-17"},{"version":"4.7.3","date":"2016-03-02","security":"true"},{"version":"4.7.4","date":"2016-03-16"},{"version":"4.7.5","date":"2016-04-06"},{"version":"4.7.6","date":"2016-04-07"},{"version":"4.7.7","date":"2016-05-04","security":"true"},{"version":"4.7.8","date":"2016-06-01","security":"true"},{"version":"4.7.9","date":"2016-07-05"},{"version":"4.7.10","date":"2016-08-03"},{"version":"4.7.11","date":"2016-09-07","security":"true"}]}}

@eileenmcnaughton
Copy link
Contributor

@twomice @nganivet this is really old - looks like it is nearly there though?

@nganivet
Copy link
Contributor

@Eileen - yes, sorry about that.
@twomice - I checked and the pingback is in the stats database, so we're good to merge. I sent you the data in a private email.

@eileenmcnaughton eileenmcnaughton merged commit 3aff619 into civicrm:master Mar 29, 2017
@eileenmcnaughton
Copy link
Contributor

done!

@twomice
Copy link
Contributor Author

twomice commented Mar 29, 2017

It's great to see this get in, finally. Thanks Eileen and Nicolas!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants