File jabberd-transactions.patch of Package jabberd

Overview Repositories Revisions Requests Users Attributes Meta

File jabberd-transactions.patch of Package jabberd (Revision cdebaa01cd233a1dcbd7fe70ab1c07df)

Currently displaying revision cdebaa01cd233a1dcbd7fe70ab1c07df , Show latest

--- jabberd-2.3.6.orig/etc/c2s.xml.dist.in
+++ jabberd-2.3.6/etc/c2s.xml.dist.in
@@ -439,10 +439,6 @@
       
       <dbname>@localstatedir@/@package@/db/sqlite.db</dbname>
 
-      
-      <transactions/>
 
       
       <busy-timeout>2000</busy-timeout>
--- jabberd-2.3.6.orig/etc/sm.xml.dist.in
+++ jabberd-2.3.6/etc/sm.xml.dist.in
@@ -141,11 +141,6 @@
       
       <dbname>@localstatedir@/@package@/db/sqlite.db</dbname>
 
-      
-      <transactions/>
-
       
       <busy-timeout>2000</busy-timeout>
     </sqlite>
--- jabberd-2.3.6.orig/storage/authreg_sqlite.c
+++ jabberd-2.3.6/storage/authreg_sqlite.c
@@ -414,15 +414,6 @@
 
     data->db = db;
 
-    if (config_get_one(ar->c2s->config,
-		       "authreg.sqlite.transactions", 0) != NULL) {
-	data->txn = 1;
-    } else {
-	log_write(ar->c2s->log, LOG_WARNING,
-		  "sqlite (authreg): transactions disabled");
-	data->txn = 0;
-    }
-
     busy_timeout = config_get_one(ar->c2s->config,
 				  "authreg.sqlite.busy-timeout", 0);
 
--- jabberd-2.3.6.orig/storage/storage_sqlite.c
+++ jabberd-2.3.6/storage/storage_sqlite.c
@@ -362,39 +362,10 @@
 	return st_SUCCESS;
     }
 
-    if (data->txn) {
-
-	res = sqlite3_exec (data->db,
-			    "BEGIN", NULL, NULL,
-			    &err_msg);
-	if (res != SQLITE_OK) {
-	    log_write (drv->st->log, LOG_ERR,
-		       "sqlite: sql transaction begin failed: %s",
-		       err_msg);
-	    sqlite3_free (err_msg);
-	    return st_FAILED;
-	}
-    }
-
     if (_st_sqlite_put_guts (drv, type, owner, os) != st_SUCCESS) {
-	if (data->txn) {
-	    res = sqlite3_exec (data->db, "ROLLBACK",
-				NULL, NULL, NULL);
-	}
 	return st_FAILED;
     }
 
-    if (data->txn) {
-
-	res = sqlite3_exec (data->db, "COMMIT", NULL, NULL, &err_msg);
-	if (res != SQLITE_OK) {
-	    log_write (drv->st->log, LOG_ERR,
-		       "sqlite: sql transaction commit failed: %s",
-		       err_msg);
-	    sqlite3_exec (data->db, "ROLLBACK", NULL, NULL, NULL);
-	    return st_FAILED;
-	}
-    }
     return st_SUCCESS;
 }
 
@@ -628,46 +599,14 @@
     int res;
     char *err_msg = NULL;
 
-    if (data->txn) {
-
-	res = sqlite3_exec (data->db, "BEGIN", NULL, NULL, &err_msg);
-	if (res != SQLITE_OK) {
-	    log_write (drv->st->log, LOG_ERR,
-		       "sqlite: sql transaction begin failed: %s",
-		       err_msg);
-	    sqlite3_free (err_msg);
-	    return st_FAILED;
-	}
-    }
-
     if (_st_sqlite_delete (drv, type, owner, filter) == st_FAILED) {
-	if (data->txn) {
-	    sqlite3_exec (data->db, "ROLLBACK", NULL, NULL, NULL);
-	}
 	return st_FAILED;
     }
 
     if (_st_sqlite_put_guts (drv, type, owner, os) == st_FAILED) {
-	if (data->txn) {
-	    sqlite3_exec (data->db, "ROLLBACK", NULL, NULL, NULL);
-	}
 	return st_FAILED;
     }
 
-    if (data->txn) {
-
-	res = sqlite3_exec (data->db, "COMMIT", NULL, NULL, &err_msg);
-
-	if (res != SQLITE_OK) {
-	    log_write (drv->st->log, LOG_ERR,
-		       "sqlite: sql transaction commit failed: %s",
-		       err_msg);
-	    sqlite3_exec (data->db, "ROLLBACK", NULL, NULL, NULL);
-
-	    return st_FAILED;
-	}
-    }
-
     return st_SUCCESS;
 }
 
@@ -707,14 +646,6 @@
 
     data->db = db;
 
-    if (config_get_one (drv->st->config,
-			"storage.sqlite.transactions", 0) != NULL) {
-	data->txn = 1;
-    } else {
-	log_write (drv->st->log, LOG_WARNING,
-		   "sqlite: transactions disabled");
-    }
-
     busy_timeout = config_get_one (drv->st->config,
 				   "storage.sqlite.busy-timeout", 0);
     if (busy_timeout != NULL) {

Places

File jabberd-transactions.patch of Package jabberd (Revision cdebaa01cd233a1dcbd7fe70ab1c07df)

Places