[dw-free] invite code distribution failing

[mark]

[commit: http://hg.dwscoalition.org/dw-free/rev/184bda4c9784]

http://bugs.dwscoalition.org/show_bug.cgi?id=1219

Make invite code distribution work in production again.

Patch by mark.

Files modified:

• cgi-bin/ljdb.pl

--------------------------------------------------------------------------------
diff -r 019a523054f5 -r 184bda4c9784 cgi-bin/ljdb.pl
--- a/cgi-bin/ljdb.pl	Sun May 17 02:42:16 2009 +0000
+++ b/cgi-bin/ljdb.pl	Sun May 17 02:48:00 2009 +0000
@@ -521,6 +521,12 @@ sub foreach_cluster {
 sub foreach_cluster {
     my $coderef = shift;
     my $opts = shift || {};
+
+    # have to include this via an eval so it doesn't actually get included
+    # until someone calls foreach cluster.  at which point, if they're in web
+    # context, it will fail.
+    eval "use LJ::DBUtil; 1;";
+    die $@ if $@;
     
     foreach my $cluster_id (@LJ::CLUSTERS) {
         my $dbr = ($LJ::IS_DEV_SERVER) ?
--------------------------------------------------------------------------------

Comments

[(Anonymous)]

/me reverts one of the changes he made to fix stats. Hmm, why does LJ::DBUtil resist being loaded in web comtext anyway?

[pauamma]

That was me.

[mark]

LJ::DBUtil connects to the inactive database, which is something that the live site should never do. I think it's just to protect us from writing code that depends on these management functions.

[pauamma]

Hmm, yes. Perhaps there should be a better way to do this? Perhaps move foreach_cluster from ljdb.pl (which puts it under LJ::) to here and move the die to within get_inactive_db? (It's not like there would be a gazillion calls to change.)

Or should this discussion be moved to dw_dev?

[mark]

Eh, it seems ok to me. I don't know what would be improved by changing the namespace?

[pauamma]

Cleaner IMO, by avoiding a runtime eval "use foo". Maybe something to consider if and when we refactor ljdb.pl as a proper module?

[mark]

Oh, okay -- yeah totally, it'd be much cleaner, I agree with that. I'm just not terribly interested in cleaning it up right now since it is, in effect, an admin tool that doesn't get used much. I'd rather see, f.ex., talkpost and talkread cleaned up into modules!

(Eventually I want to deprecate *lib.pl!)