Henry Lyne (henrylyne) wrote in changelog,
Henry Lyne
henrylyne
changelog

[livejournal] r14786: Allow the uniq cookie mapping to be stor...

Committer: henrylyne
Allow the uniq cookie mapping to be stored in a separate database.

U   trunk/cgi-bin/ljdb.pl
Modified: trunk/cgi-bin/ljdb.pl
===================================================================
--- trunk/cgi-bin/ljdb.pl	2009-01-21 08:38:13 UTC (rev 14785)
+++ trunk/cgi-bin/ljdb.pl	2009-01-21 16:44:59 UTC (rev 14786)
@@ -300,13 +300,21 @@
     return LJ::get_dbh("master");
 }
 
+# Use the uniq DB if available, otherwise fall back to the main database
+# Force the use of the uniq DB by setting $LJ::_PRAGMA_FORCE_UNIQ
 sub get_uniq_db_reader {
-    return LJ::get_dbh("uniq_master") if $LJ::_PRAGMA_FORCE_MASTER;
-    return LJ::get_dbh("uniq_slave", "uniq_master");
+    if ($LJ::_PRAGMA_FORCE_UNIQ) {
+        return $LJ::_PRAGMA_FORCE_MASTER ?
+            LJ::get_dbh("uniq_master") :
+            LJ::get_dbh("uniq_slave", "uniq_master");
+    }
+    return LJ::get_dbh("uniq_master", "master") if $LJ::_PRAGMA_FORCE_MASTER;
+    return LJ::get_dbh("uniq_slave", "uniq_master", "slave", "master");
 }
 
 sub get_uniq_db_writer {
-    return LJ::get_dbh("uniq_master");
+    return LJ::get_dbh("uniq_master") if $LJ::_PRAGMA_FORCE_UNIQ;
+    return LJ::get_dbh("uniq_master", "master");
 }
 
 # <LJFUNC>

Subscribe

  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments