Skip to content

Commit 8c190a1

Browse files
committed
Fixing final version to master branch, preparing for release v3.2.1
1 parent 2fc671d commit 8c190a1

7 files changed

+12
-8
lines changed

README.md

+5
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,11 @@ This will disable the maintenance mode.
449449

450450
### ChangeLog
451451

452+
#### v3.2.1
453+
* Bumped library versions, including security patches.
454+
* Fixed a bug in the PostgreSQL handler.
455+
* Some forgotten naming from Torrust-Axum to Torrust-Actix.
456+
452457
#### v3.2.0
453458
* Bumped library versions.
454459
* Modified the way scheduling was done through threads, it could lock up and slow down public trackers with heavy activity.

bin/pgsql_structure.sql

+2-3
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,13 @@ ALTER TABLE IF EXISTS public.keys
5454
CREATE TABLE IF NOT EXISTS public.users
5555
(
5656
uuid bytea NOT NULL,
57-
`key` bytea NOT NULL,
57+
keyhash bytea NOT NULL,
5858
uploaded bigint NOT NULL DEFAULT 0,
5959
downloaded bigint NOT NULL DEFAULT 0,
6060
completed bigint NOT NULL DEFAULT 0,
6161
updated bigint NOT NULL DEFAULT 0,
6262
active bigint NOT NULL DEFAULT 0,
63-
CONSTRAINT users_puuid PRIMARY KEY (uuid),
64-
CONSTRAINT users_pkey PRIMARY KEY (`key`)
63+
CONSTRAINT users_puuid_keyhash PRIMARY KEY (uuid, keyhash)
6564
)
6665

6766
TABLESPACE pg_default;

bin/torrust-actix_linux_x86_64

92 KB
Binary file not shown.

bin/torrust-actix_windows_x86_64.exe

60 KB
Binary file not shown.

docker/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM rust:alpine3.17
1+
FROM rust:alpine3.18
22

33
ARG FULL_CONFIG=""
44
ENV FULL_CONFIG=$FULL_CONFIG
@@ -97,7 +97,7 @@ ENV USERS=$USERS
9797

9898
ARG DB_STRUCTURE_DB_USERS="users"
9999
ARG DB_STRUCTURE_TABLE_USERS_UUID="uuid"
100-
ARG DB_STRUCTURE_TABLE_USERS_KEY="key"
100+
ARG DB_STRUCTURE_TABLE_USERS_KEY="keyhash"
101101
ARG DB_STRUCTURE_TABLE_USERS_UPLOADED="uploaded"
102102
ARG DB_STRUCTURE_TABLE_USERS_DOWNLOADED="downloaded"
103103
ARG DB_STRUCTURE_TABLE_USERS_COMPLETED="completed"
@@ -107,7 +107,7 @@ ENV DB_STRUCTURE_DB_USERS=$DB_STRUCTURE_DB_USERS DB_STRUCTURE_TABLE_USERS_UUID=$
107107

108108
RUN apk add git musl-dev
109109
RUN git clone https://github.com/Power2All/torrust-actix.git /root/torrust-actix
110-
RUN cd /root/torrust-actix && git checkout tags/v3.2.0
110+
RUN cd /root/torrust-actix && git checkout tags/v3.2.1
111111
WORKDIR /root/torrust-actix
112112
RUN cd /root/torrust-actix
113113
RUN cargo build --release && rm -Rf target/release/.fingerprint target/release/build target/release/deps target/release/examples target/release/incremental

src/database/postgresql.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ impl DatabaseConnectorPgSQL {
3939

4040
let mut structure = DatabaseConnector { mysql: None, sqlite: None, pgsql: None, engine: None };
4141
structure.pgsql = Some(DatabaseConnectorPgSQL { pool: pgsql_connect.unwrap() });
42-
structure.engine = Some(DatabaseDrivers::mysql);
42+
structure.engine = Some(DatabaseDrivers::pgsql);
4343

4444
structure
4545
}

src/databases.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ impl DatabaseConnector {
7070
if self.engine.is_some() {
7171
return match self.engine.clone().unwrap() {
7272
DatabaseDrivers::sqlite3 => { self.sqlite.clone().unwrap().load_blacklist(tracker.clone()).await }
73-
DatabaseDrivers::mysql => { self.mysql.clone().unwrap().load_blacklist(tracker.clone()).await}
73+
DatabaseDrivers::mysql => { self.mysql.clone().unwrap().load_blacklist(tracker.clone()).await }
7474
DatabaseDrivers::pgsql => { self.pgsql.clone().unwrap().load_blacklist(tracker.clone()).await }
7575
};
7676
}

0 commit comments

Comments
 (0)