| *** bse has quit IRC | 00:15 | |
| *** keksschaf has quit IRC | 00:23 | |
| *** keksschaf has joined #cc | 00:25 | |
| *** keksschaf has quit IRC | 00:38 | |
| *** tanjir has joined #cc | 01:19 | |
| *** jgay has quit IRC | 01:30 | |
| *** Danny_B has quit IRC | 01:42 | |
| *** Danny_B has joined #cc | 01:43 | |
| *** CharelB has quit IRC | 01:45 | |
| *** greg-g has quit IRC | 01:45 | |
| *** CharelB has joined #cc | 01:46 | |
| *** greg-g has joined #cc | 01:50 | |
| *** greg-g has quit IRC | 01:56 | |
| *** greg-g has joined #cc | 01:56 | |
| *** stevel has quit IRC | 02:22 | |
| *** e_6 has joined #cc | 02:48 | |
| *** SignpostMarv has joined #cc | 02:59 | |
| * SignpostMarv has a question about what license to put stuff under :-s | 03:01 | |
| *** bse has joined #cc | 03:01 | |
| greg-g | SignpostMarv: ask away. | 03:13 |
|---|---|---|
| SignpostMarv | would no derivitives prevent people from recording lyrics as a song ? | 03:19 |
| greg-g | I am not a lawyer, but, my reading and understanding would say people are prevented from recording the lyrics as a song under an ND license. I _believe_ that use would be classified as an adaptation (in other words, a derivative). | 03:22 |
| greg-g | just as syncing music to video is considered a derivative | 03:23 |
| greg-g | in fact, the more I think about it, the more I believe that would not be allowed under a ND license. | 03:24 |
| greg-g | (and reading the legalcode, which you can find here: http://creativecommons.org/licenses/by-nd/3.0/legalcode ) | 03:25 |
| SignpostMarv | hehe. legalese ftl :-P | 03:25 |
| greg-g | well, that is what you are agreeing to when you use the license. just fyi :) | 03:25 |
| SignpostMarv | so Share Alike should be sufficient then ? | 03:26 |
| greg-g | what do you mean, sufficient, and by ShareAlike you mean BY-SA or BY-ND-SA? | 03:26 |
| ianweller | a ND license, as i read it, basically means you can share the work but you can't make anything out of it or change it. | 03:28 |
| ianweller | so if you put instrumental tracks for narration under a ND license they'd be of no use i guess | 03:28 |
| greg-g | ianweller: that is how I understand it as well, yes. | 03:29 |
| SignpostMarv | BY-SA | 03:33 |
| greg-g | BY-SA is a great license, and I recommend it for a lot of circumstances. | 03:33 |
| * ianweller agrees | 03:33 | |
| ianweller | i use BY a lot more though | 03:33 |
| greg-g | ianweller: go CC0! :) | 03:34 |
| ianweller | nah | 03:34 |
| ianweller | ;P | 03:34 |
| SignpostMarv | now, the other question; | 03:36 |
| SignpostMarv | I'm wanting to do a parody lyrics site | 03:36 |
| SignpostMarv | not sure if I can actually relicense parodies :-s | 03:36 |
| *** nkinkade has left #cc | 03:51 | |
| *** parkerhiggins has joined #cc | 04:07 | |
| *** tanjir is now known as tanjir_ | 04:27 | |
| *** tanjir_ is now known as tanjir | 04:27 | |
| *** SignpostMarv has quit IRC | 04:41 | |
| *** parkerhiggins has quit IRC | 04:42 | |
| *** parkerhiggins has joined #cc | 04:44 | |
| *** parkerhiggins has quit IRC | 04:53 | |
| *** parkerhiggins has joined #cc | 04:58 | |
| *** tanjir has quit IRC | 06:13 | |
| *** Bovinity has quit IRC | 06:16 | |
| *** zu22 has joined #CC | 06:19 | |
| *** zu22 has left #CC | 06:19 | |
| *** sama has joined #cc | 08:24 | |
| *** UncleCJ2_ has quit IRC | 08:41 | |
| *** UncleCJ2_ has joined #cc | 08:46 | |
| *** balor has joined #cc | 09:14 | |
| *** UncleCJ2_ has joined #cc | 09:16 | |
| *** borem has joined #cc | 09:44 | |
| *** borem has left #cc | 09:46 | |
| *** keksschaf has joined #cc | 10:01 | |
| *** UncleCJ2__ has joined #cc | 10:26 | |
| *** UncleCJ2_ has quit IRC | 10:54 | |
| *** balor has quit IRC | 12:32 | |
| *** lotia has joined #cc | 12:37 | |
| *** UncleCJ2__ has quit IRC | 12:37 | |
| *** jgay has joined #cc | 12:40 | |
| *** keksschaf has quit IRC | 12:52 | |
| *** jgay has quit IRC | 13:18 | |
| *** UncleCJ2__ has joined #cc | 13:24 | |
| *** sama has quit IRC | 13:46 | |
| *** sama has joined #cc | 13:48 | |
| *** sama has quit IRC | 14:14 | |
| *** sama has joined #cc | 14:15 | |
| *** grue_ is now known as grue | 14:23 | |
| *** mlinksva has joined #cc | 14:25 | |
| *** stevel has joined #cc | 14:30 | |
| *** UncleCJ2__ has quit IRC | 14:33 | |
| *** kreynen has joined #cc | 15:02 | |
| *** johndoigiii has joined #cc | 15:09 | |
| *** johndoigiii_ has joined #cc | 15:17 | |
| *** kreynen_ has joined #cc | 15:19 | |
| *** johndoigiii has quit IRC | 15:24 | |
| *** kreynen has quit IRC | 15:25 | |
| *** kreynen has joined #cc | 15:25 | |
| *** nkinkade has joined #cc | 15:26 | |
| *** kreynen_ has quit IRC | 15:30 | |
| *** johndoigiii has joined #cc | 15:32 | |
| *** johndoigiii_ has quit IRC | 15:32 | |
| *** keksschaf has joined #cc | 15:41 | |
| *** UncleCJ2_ has joined #cc | 15:45 | |
| *** Bovinity has joined #cc | 15:55 | |
| *** Danny_B has quit IRC | 16:01 | |
| *** Danny_B has joined #cc | 16:01 | |
| *** Danny_B has quit IRC | 16:05 | |
| *** Danny_B has joined #cc | 16:06 | |
| *** Ekushey has joined #cc | 16:15 | |
| *** mlinksva has quit IRC | 16:17 | |
| *** mlinksva has joined #cc | 16:20 | |
| *** sama has quit IRC | 16:20 | |
| *** Bovinity has quit IRC | 16:22 | |
| *** mecredis has joined #cc | 16:23 | |
| *** parkerhiggins has quit IRC | 16:24 | |
| *** kreynen has quit IRC | 16:27 | |
| *** K`Tetch has quit IRC | 16:27 | |
| *** parkerhiggins has joined #cc | 16:29 | |
| *** mecredis has quit IRC | 16:40 | |
| *** K`Tetch has joined #cc | 16:41 | |
| *** Bovinity has joined #cc | 16:41 | |
| *** nathany has joined #cc | 16:42 | |
| nathany | morning | 16:43 |
| johndoigiii | morning nathany | 16:43 |
| nkinkade | nathany: There seems to be a problem with the license chooser for French and French (CA). | 16:43 |
| nathany | in what way? | 16:44 |
| nkinkade | http://creativecommons.org/license/results-one?q_1=2&q_1=1&field_commercial=yes&field_derivatives=yes&field_jurisdiction=fr&field_format=&field_worktitle=&field_attribute_to_name=&field_attribute_to_url=http%3A%2F%2Fcite.url&field_sourceurl=http%3A%2F%2Fsource.url&field_morepermissionsurl=&lang=fr&language=fr&n_questions=3 | 16:44 |
| nkinkade | That's ugly, but should work (or not quite, really). | 16:44 |
| nkinkade | The Source URL is not displayed in the resulting HTML. | 16:45 |
| nathany | can you tell me how it's not working? | 16:45 |
| nathany | oh | 16:45 |
| nkinkade | A bad translation causing a problem? | 16:45 |
| nathany | that's the first thing to look at | 16:46 |
| nathany | one moment | 16:46 |
| nkinkade | The same thing happens for French (CA) ... but it seems to be working for English and Spanish, so the problem may likely be in a badly translated string. | 16:46 |
| nathany | nkinkade: btw, can you go to http://socghop.appspot.com/ and sign up for an account, complete the profile and let me know what your "link id" is? | 16:46 |
| nathany | i need a backup admin for SoC | 16:46 |
| nathany | nkinkade: yeah, it's a borked i18n string | 16:48 |
| nathany | i assume someone complained? | 16:48 |
| nkinkade | Yeah. | 16:48 |
| nkinkade | nathany: I still have my SoC account from last year: nkinkade | 16:49 |
| nathany | nkinkade: does that credential still work? they went to a new web app | 16:49 |
| nathany | nkinkade: yeah, it's all the french translations... i'll get that committed and synced up | 16:50 |
| nkinkade | nathany: It seems to. | 16:50 |
| nathany | oh, cool | 16:50 |
| nathany | ok | 16:50 |
| nkinkade | nathany: Should I make a ticket for that, or can you ping me when it's fixed so that I can respond to that person? | 16:50 |
| nathany | i can ping you | 16:51 |
| * nathany wishes we had a more automated way to push these things out | 16:51 | |
| nkinkade | Thanks. Meanwhile, I'm going to rebuild the HK Deeds. | 16:51 |
| * nkinkade wishes that Deeds generated on-the-fly were viable. | 16:51 | |
| nathany | of course, i don't know french, but i'm assuming the source link goes @ the end.... | 16:52 |
| *** mattl has left #cc | 16:52 | |
| * paulproteus could help if desired | 16:55 | |
| nathany | paulproteus: i forgot you know french, right? | 16:56 |
| nathany | does this look sane? | 16:56 |
| nathany | Basé(e) sur une oeuvre à ${source_link}. | 16:56 |
| paulproteus | Yes. | 16:56 |
| nathany | thanks | 16:56 |
| paulproteus | (-: | 16:56 |
| nkinkade | nathany: I just decided to create another GApps mail group for Nagios messages ... one for SMS and one for email notifications. | 16:57 |
| nathany | ok cool | 16:57 |
| nathany | btw, if anyone else is trying to regenerate the XSLT for license selection (nkinkade, paulproteus), the arabic translation is broken so i've been removing it manually | 16:59 |
| nathany | as the jordan port continues we'll need to let them know that their translation needs fixed | 17:00 |
| paulproteus | ACK, nathany | 17:01 |
| *** jgay has joined #cc | 17:09 | |
| nkinkade | nathany: Does the process that runs cc.engine on a5 looks like this these days: /usr/bin/python2.5 ./bin/cc_engi | 17:24 |
| nkinkade | ne -S /var/www/creativecommons.org/cc.engine/eggs/zdaemon-2.0.2-py2.5.egg/zdaemon/schema.xml -C z | 17:24 |
| nkinkade | daemon.conf bin/paster serve deploy.ini | 17:24 |
| nkinkade | Ooops. | 17:24 |
| nkinkade | (at least something like that) | 17:24 |
| nkinkade | nathany: http://code.creativecommons.org/issues/issue216 | 17:35 |
| nkinkade | nathany: ^^ ... and also I'm having a problem running buildout on my local checkout of cc.engine/branches/production | 17:52 |
| nkinkade | It can't install lxml. | 17:53 |
| nathany | nkinkade: sorry was in a meeting | 17:54 |
| nathany | nkinkade: with respect to the latter (buildout) do you have libxml2-dev and libxslt1-dev installed? (system packages) | 17:54 |
| nathany | lxml isn't a new dependency for cc.engine... is it giving a specific error? | 17:55 |
| nkinkade | nathany: No, they weren't but they are now, and I'm re-attempting buildout. | 17:57 |
| nkinkade | Not sure how I could have builtout before ... maybe the dev packages were removed with some upgrade. | 17:58 |
| nathany | nkinkade: we may have changed to a different version of lxml... it's possible there was an egg available for the other version (or for a different Python version?) | 18:01 |
| *** kreynen has joined #cc | 18:05 | |
| nathany | nkinkade: the french issue is fixed | 18:06 |
| nkinkade | nathany: Thanks. That was fast. | 18:07 |
| nathany | i've had a lot of practice lately :) | 18:07 |
| nkinkade | nathany: Are we safe to shutdown tomcat on a8? | 18:26 |
| nathany | i think so | 18:26 |
| nkinkade | I'll try it and see if something blows up. :-) | 18:26 |
| nathany | i mean, let's not go crazy and rip it out but yeah, give it a try :) | 18:26 |
| *** nathany has quit IRC | 18:31 | |
| *** nathany has joined #cc | 18:32 | |
| *** UncleCJ2_ has quit IRC | 18:36 | |
| *** e_6 has joined #cc | 18:39 | |
| *** kreynen has quit IRC | 18:46 | |
| nathany | nkinkade: what does the old watchdog script look for for cc.engine? | 19:05 |
| nathany | (or where is the watchdog script so i can take a look) | 19:05 |
| nkinkade | a5:/root/bin/check_webservices.sh | 19:05 |
| nkinkade | nathany: ^^ | 19:06 |
| nathany | thanks | 19:06 |
| nkinkade | I commented out the part that would normally have restarted cc.engine | 19:06 |
| nathany | right | 19:07 |
| nathany | nkinkade: do you get an email when the watchdog kills / restarts the license engine | 19:28 |
| nkinkade | nathany: Yea. | 19:32 |
| nkinkade | Well, root gets a mail, which means I get a mail. | 19:32 |
| nathany | i'm curious -- how often did you get one before the cut over? | 19:33 |
| *** UncleCJ2_ has joined #cc | 19:34 | |
| nathany | nkinkade: ^^ | 19:37 |
| nkinkade | nathany: Usually 2 per day, or so. | 19:38 |
| *** keksschaf has quit IRC | 19:38 | |
| nathany | interesting | 19:38 |
| *** robmyers has joined #cc | 19:38 | |
| nkinkade | If the watchdog script weren't there to restart cc.engine it would have daily caused problems on a5 due to memory usage. | 19:38 |
| nkinkade | Even as we speak paster is using 1.5G of resident memory. | 19:39 |
| nathany | nkinkade: right, but not causing problems as far as i can tell (or no?) | 19:39 |
| nathany | i mean, that's a lot, yes | 19:39 |
| nkinkade | That seems excessive to me. | 19:40 |
| nkinkade | Even Varnish is only using around 150M. | 19:40 |
| nkinkade | paster is also consistently using between 25% and 50% of the CPU, as reported by top. | 19:41 |
| nkinkade | That too seems excessive. | 19:41 |
| *** stevel_ has joined #cc | 19:41 | |
| nathany | i concur that it's a lot | 19:41 |
| nathany | i don't think you can reasonably compare varnish and the license engine since they're totally different domains | 19:41 |
| nathany | and i'm not saying we don't need the watchdog | 19:42 |
| nkinkade | It'd be nice if we didn't need it as a matter of daily maintenance. | 19:42 |
| nathany | right | 19:42 |
| nkinkade | In a perfect world. | 19:42 |
| nkinkade | But it was working well enough before to just restart cc.engine a couple times a day when it's memory usage got too high. | 19:42 |
| nkinkade | But what is cc.engine doing that would cause it use quite a lot more resources than anything else on the system? | 19:43 |
| nkinkade | Or is it just the most used thing on a5 and unavoidable? | 19:43 |
| nkinkade | The Deeds are static. | 19:44 |
| nkinkade | So Apache gets those, and Varnish too. | 19:44 |
| nkinkade | What is cc.engine handling that it's resource usage is so high compared to everything else? | 19:44 |
| nathany | it's doing the license selection stuff, publicdomain, cc 0 (and deeds for cc0) | 19:45 |
| nathany | i suspect we'll get some win when we dump the xslt stuff | 19:45 |
| nathany | anyway, i'll get something in place wrt the watchdog today | 19:46 |
| nathany | off to lunch now | 19:46 |
| *** stevel has quit IRC | 19:49 | |
| nkinkade | nathany: It's probably worth devoting some time to doing an investigation of what cc.engine is using all those CPU cycles for and why it uses so much memory. a5 seems to be humming along okay, but I worry that this isn't a good scenario for load spikes. That is, it may be humming along now, but it may bog down badly if load increases for any reason. paulproteus seems to enjoy tackling problems like this. I'm not assigning him i | 19:53 |
| *** Steren has joined #CC | 20:10 | |
| Steren | hi | 20:10 |
| Steren | I was wondering if you guys out there were aware of the FAC (Featured Artists Coalition, http://www.featuredartistscoalition.com/ ) that is growing up these days. Maybe CC should try to participate in the talks, what do you think ? | 20:14 |
| Steren | I have to go, don't hesitate to email me if you want to talk about this, bye | 20:24 |
| *** Steren has quit IRC | 20:24 | |
| robmyers | FAC is in the UK. some of the people in it know ORG. it's more for musicians though. | 20:24 |
| *** robmyers has quit IRC | 20:50 | |
| paulproteus | nkinkade, "I'm not assigning him i" (trunc) | 21:03 |
| paulproteus | Try ps_mem.py re: memory usage | 21:03 |
| paulproteus | Feel free to assign me a ticket to look at cc.engine deployment/mem usage. | 21:03 |
| nkinkade | nathany: Do you have an opinion on this ^^? | 21:05 |
| nkinkade | I'd love to make a ticket and have paulproteus give it a glance when he has a moment. | 21:06 |
| nathany | nkinkade: i think paulproteus has plenty on his plate | 21:06 |
| nkinkade | You're decision. | 21:06 |
| nathany | feel free to create a ticket | 21:06 |
| nathany | i'm looking at a couple things now | 21:06 |
| nathany | paulproteus: it appears ps_mem.py just tells you how much it's using, not where it's using it, correct? | 21:07 |
| paulproteus | Yes. | 21:07 |
| nkinkade | Bovinity: Are you familiar with the Javascript that is supposed to go in the footer of each contribution page in CiviCRM? | 21:07 |
| nkinkade | As in the past, it's causing problem with editing contribution pages because CiviCRM doesn't like to see <script> tags in the content. | 21:08 |
| Bovinity | nkinkade: i'm familiar with civicrm giving me errors when i would submit a page with JS in the footer, since it thought i was adding injection attacks | 21:08 |
| paulproteus | FWIW, I'd say Chinese FastCGI is likely to be a good answer, still, for cc.engine. | 21:08 |
| nkinkade | I can override it, but I'm starting to feel that the JS in those pages isn't needed anyway. | 21:08 |
| nathany | WTF? | 21:08 |
| Bovinity | nkinkade: i thought i pulled that code and made it generic enough toput into a js file | 21:08 |
| nkinkade | Vestigial, that is. | 21:08 |
| paulproteus | I could spend a lot longer and come to a more detailed conclusion, but if you just cycle the processes you'll go far. | 21:09 |
| nathany | i don't think you've ever proposed that for cc.engine and that presumes we can run it with a fcgi front end | 21:09 |
| nkinkade | It appears to be code to auto-select some option in a list, but I think we've got that somewhere else now. | 21:09 |
| Bovinity | nkinkade: yes, we do, it shouldn't be in the footer entries any more | 21:09 |
| paulproteus | "still" means it's like a reflex now. | 21:09 |
| paulproteus | And it does presume that, yeah; as I said I've spent ca. 0s looking at this. | 21:09 |
| nkinkade | Bovinity: I'll pastebin the JS just so you can take a quick look. | 21:09 |
| * nathany rolls his eyes | 21:09 | |
| * paulproteus goes back to lurking | 21:09 | |
| nkinkade | Bovinity: http://pastebin.com/d1437e82c | 21:10 |
| Bovinity | nkinkade: yeah, i'm 95% sure that's now in an included JS file, just rewritten slightly to work properly | 21:11 |
| nkinkade | nathany: Regarding the watchdog script, I'll be happy to get it back in working order. | 21:11 |
| nkinkade | I just wanted to make sure I knew which process(es) might need cycling these days, and if there might be new, bad side effects of doing so. | 21:11 |
| nathany | nkinkade: yes, please restore it; i'm looking at weeding some extra libraries from the app that may slim it down a little bit | 21:12 |
| nkinkade | Bovinity: I'm going to remove it from one page, test it, and if nothing seems wrong I'll remove it from all of them. FYI. | 21:12 |
| Bovinity | sure thing! | 21:12 |
| nkinkade | nathany: I'll set it to cycle cc.engine when it's memory usage exceeds 1G. So the master paster process is the one to go for? It appears to be the one using most of the memory and CPU. | 21:13 |
| nathany | nkinkade: yes, i think one side effect of the switch over is that things that were split into a couple processes before are in the same process space now | 21:13 |
| nathany | there actually is a zdaemon process watching paster so you may be able to just kill paster and have zdaemon do the restart | 21:14 |
| nkinkade | Cool. Thanks for taking a look at that. | 21:14 |
| nathany | nkinkade: ^^ | 21:14 |
| nathany | maybe test on staging to see if it does what you expect? | 21:14 |
| nkinkade | nathany: Would you prefer to test that right now, or shall I? | 21:14 |
| nathany | (if you plan on letting zdaemon pick up the slack) | 21:14 |
| nkinkade | Ah. | 21:14 |
| nkinkade | Better plan. | 21:14 |
| nkinkade | We don't have a staging server for nothing. | 21:14 |
| nathany | :) | 21:15 |
| nkinkade | Bovinity: Looks like that JS was still being used. | 21:19 |
| Bovinity | nkinkade: odd... | 21:19 |
| nkinkade | But I'd like to migrate it somewhere else. | 21:19 |
| nkinkade | https://support.creativecommons.org/civicrm/contribute/transact?reset=1&id=5&x=20&y=18 | 21:19 |
| nkinkade | See that page, for example. Now you get the "Premium" fieldset box, with nothing checked. | 21:19 |
| Bovinity | nkinkade: oh, maybe i was just thinking of the Join/Donate transacts | 21:19 |
| nkinkade | Do you have an preference for where the code should be relocated to? | 21:19 |
| nkinkade | support.js, or whatever it's called? | 21:20 |
| Bovinity | yeah | 21:20 |
| nathany | johndoigiii: just saw your bug message, looks like you're on the right track | 21:25 |
| nathany | are you working in a "feature" branch? | 21:26 |
| nathany | btw, paulproteus, nkinkade, Bovinity, johndoigiii, have you see http://gitready.com/? | 21:26 |
| nathany | (also, paulproteus, i think you'll appreciate http://whygitisbetterthanx.com/) | 21:27 |
| Bovinity | nathany: neat | 21:27 |
| Bovinity | whygitisbetterthanx is great | 21:27 |
| *** stevel_ has quit IRC | 21:28 | |
| johndoigiii | nathany yes I was on a "security_changes" branch but switched to master while I was working on the other issues | 21:28 |
| *** stevel has joined #cc | 21:28 | |
| paulproteus | I've seen both on the git mailing list and greatly enjoyed them. (-: For no good reason I don't use grb. | 21:28 |
| johndoigiii | I can revert master | 21:29 |
| nkinkade | Nice. I'm getting fairly comfortable with using git for basic things, but I'm still vague on many things. | 21:29 |
| paulproteus | I kind of wish that they had made it a "git command", like $ git remote-branch create [...] | 21:29 |
| nathany | paulproteus: grb? | 21:29 |
| paulproteus | (or git r-b for short, even) | 21:29 |
| paulproteus | yeah | 21:29 |
| *** hdworak has joined #cc | 21:29 | |
| hdworak | hi | 21:29 |
| paulproteus | Er, grb == http://grb.rubyforge.org/ , linked-to from gitready.com | 21:29 |
| hdworak | have you applied for GSoC 2009? :) | 21:29 |
| paulproteus | But now I see... wow, this site is awesome. | 21:29 |
| nathany | ah | 21:29 |
| paulproteus | I thought it was just a link to grb! | 21:30 |
| nathany | hdworak: we are going to | 21:30 |
| johndoigiii | this site is really cool | 21:30 |
| nathany | johndoigiii: i know that you pushed changes on master for the early issues you worked on and that's fine | 21:31 |
| nathany | i was specifically referring to the https/open id stuff | 21:31 |
| johndoigiii | yeah, I was working on a branch but prematurely merged | 21:31 |
| nathany | ah | 21:32 |
| johndoigiii | just installed a git plugin for Textmate | 21:32 |
| paulproteus | This is like our phrasebook but actually maintained. | 21:32 |
| nathany | i'd appreciate it if you can back that out (the merge of the security work) | 21:32 |
| nathany | so i can more easily merge your other stuff | 21:32 |
| johndoigiii | yup I will back it out | 21:32 |
| nathany | thanks :) | 21:32 |
| nathany | paulproteus: yeah, i wonder if we should just kill the phrasebook :) | 21:33 |
| paulproteus | +2, Insightful | 21:33 |
| nathany | :) | 21:33 |
| paulproteus | Okay, back to lurking for real. | 21:33 |
| johndoigiii | how far back? nathany | 21:33 |
| johndoigiii | just out of the https stufF? | 21:34 |
| nathany | johndoigiii: yes | 21:34 |
| nathany | looks like two commits? | 21:34 |
| nathany | (at least that have been pushed to code) | 21:34 |
| johndoigiii | alrighty, just wanted to make sure the change email interface was fine | 21:35 |
| nathany | yeah, absolutely | 21:35 |
| johndoigiii | okay cool | 21:35 |
| nkinkade | nathany: Attempting to merge the newly created HK Deeds into branches/production of license.rdf is causing massive amounts of conflicts. | 21:38 |
| nkinkade | Would that be a result of the changes?? | 21:38 |
| nathany | well conflicts are always the result of changes [in the files] ;) but i'm going to assume you're referring to the license engine changes? | 21:39 |
| nathany | nkinkade: ^^ | 21:40 |
| nkinkade | nathany: Yeah. :-) | 21:40 |
| nathany | nkinkade: can you pastebin an example of a conflict? i don't know off the top of my head... | 21:41 |
| nkinkade | It appears that every single newly generated Deed conflicts. | 21:41 |
| nkinkade | nathany: http://pastebin.com/d46b16cb2 | 21:42 |
| nkinkade | The lang=en part, and that's just one of a many in a given file. | 21:42 |
| nkinkade | Some are quite large. | 21:42 |
| *** hdworak1 has joined #cc | 21:42 | |
| nathany | nkinkade: so that *is* the result of a change, but it's a pretty old one | 21:43 |
| nathany | i'm think you should be able to just generate the deeds from cc.engine production with an output dir of license.rdf/b/production | 21:44 |
| nkinkade | nathany: What can be done? | 21:44 |
| nkinkade | Oh. | 21:44 |
| nkinkade | I'll try that now. | 21:44 |
| nathany | nkinkade: this is the sad fact -- merge algorithms are limited (although it *does* seem a little weird that it can't figure this out...) | 21:44 |
| nkinkade | There was another that I couldn't understand at all ... some new text inserted below some old unchanged text. | 21:46 |
| nathany | nkinkade: one second... let me look at something quick | 21:47 |
| nkinkade | nathany: I can send you an entire conflicting file, if you like. | 21:48 |
| nathany | nkinkade: i just realized that a changeset (or more than one) leaked into production | 21:48 |
| nathany | so production on cc.engine contains changes that we don't want to roll out yet (sigh) | 21:48 |
| hdworak1 | just in case: GSoC's deadline for mentoring orgs is tomorrow noon | 21:48 |
| hdworak1 | ;) | 21:48 |
| nathany | hdworak1: yup | 21:49 |
| hdworak1 | ok! | 21:49 |
| hdworak1 | good luck | 21:49 |
| *** hdworak1 has quit IRC | 21:49 | |
| nathany | nkinkade: short answer is you can't regenerate HK deeds today | 21:53 |
| nkinkade | nathany: I'll make a ticket for myself. | 21:54 |
| nathany | thanks | 21:54 |
| nkinkade | nathany: You were correct. I just twice killed the master paster process on a7 and it was immediately respawned by zdaemon. | 21:55 |
| nathany | nkinkade: cool :) | 21:55 |
| nathany | i'm glad there's a little good news | 21:55 |
| nkinkade | I think I'll just let zdaemon handle the restarting, that way we don't have to worry about init scripts, and there is probably less overhead to let zdaemon do it. | 21:55 |
| nkinkade | Is Allison in the office? | 21:55 |
| nathany | she's not at her desk | 21:56 |
| nathany | she was in earlier | 21:56 |
| nkinkade | Ah. nathany: Just one more thing. For a while now I've noticed that mkdeeds never gives me back the terminal when it completes ... doesn't even accept TERM signals .. I have to background it and then kill %1 it. | 21:57 |
| nkinkade | But this has been happening for quite some time, long before these changes. | 21:57 |
| nkinkade | Not an action item, but just an FYI. | 21:57 |
| nathany | nkinkade: yeah, i remember you reporting that | 21:58 |
| *** jgay has quit IRC | 22:00 | |
| *** mecredis has joined #cc | 22:05 | |
| *** lotia has quit IRC | 22:11 | |
| *** hdworak has quit IRC | 22:11 | |
| nathany | nkinkade: the GSoC webapp says you don't exist as a use | 22:23 |
| nathany | user | 22:23 |
| nathany | did you complete your profile and set a link id? | 22:23 |
| nathany | http://socghop.appspot.com/user/edit_profile | 22:23 |
| nkinkade | nathany: Let me double check. | 22:24 |
| nkinkade | nathany: Try now. | 22:25 |
| *** tanjir has joined #cc | 22:26 | |
| nkinkade | I thought that was somehow related to the last year's GSoC stuff, for which I had setup everything to be a mentor, etc. | 22:26 |
| nathany | nkinkade: yup, thanks | 22:26 |
| *** [mharrison] has quit IRC | 22:51 | |
| *** stevel has quit IRC | 23:13 | |
| *** johndoigiii has quit IRC | 23:47 | |
| Bovinity | nkinkade: its been a while since you last looked, but any ideas off the top of your head why the RSS Importer part of the cc WP plugin won't add an initial feed? | 23:52 |
| Bovinity | i'm trying to set it up on my local machine for testing | 23:52 |
| Bovinity | some config gotcha or anything | 23:52 |
| Bovinity | nkinkade: nevermind, the plugin isn't setting up wordpress properly, for me at least. | 23:57 |
| Bovinity | s/wordpress/mysql/ :/ | 23:57 |
Generated by irclog2html.py 2.6 by Marius Gedminas - find it at mg.pov.lt!