@@ -288,7 +288,8 @@ public class ApiConstants { | |||||
public static final String Q_REDIRECT = "redirect"; | public static final String Q_REDIRECT = "redirect"; | ||||
public static final int MAX_NOTIFY_LOG = 10000; | public static final int MAX_NOTIFY_LOG = 10000; | ||||
public static final int ERROR_MAXLEN = 4000; | |||||
public static final int ERROR_MAXLEN = 20000; | |||||
public static final int ERROR_MAX_BEFORE_ELLIPSES = 19900; | |||||
public static String getToken(String json) { | public static String getToken(String json) { | ||||
if (json == null) return null; | if (json == null) return null; | ||||
@@ -21,8 +21,7 @@ import javax.persistence.*; | |||||
import javax.validation.constraints.Pattern; | import javax.validation.constraints.Pattern; | ||||
import javax.validation.constraints.Size; | import javax.validation.constraints.Size; | ||||
import static bubble.ApiConstants.EP_BACKUPS; | |||||
import static bubble.ApiConstants.ERROR_MAXLEN; | |||||
import static bubble.ApiConstants.*; | |||||
import static bubble.service.backup.BackupService.BR_STATE_LOCK_TIMEOUT; | import static bubble.service.backup.BackupService.BR_STATE_LOCK_TIMEOUT; | ||||
import static org.cobbzilla.util.daemon.ZillaRuntime.empty; | import static org.cobbzilla.util.daemon.ZillaRuntime.empty; | ||||
import static org.cobbzilla.util.string.StringUtil.ellipsis; | import static org.cobbzilla.util.string.StringUtil.ellipsis; | ||||
@@ -72,7 +71,7 @@ public class BubbleBackup extends IdentifiableBase implements HasAccount { | |||||
@ECSearchable(filter=true) @ECField(index=60) | @ECSearchable(filter=true) @ECField(index=60) | ||||
@Type(type=ENCRYPTED_STRING) @Column(updatable=false, columnDefinition="varchar("+(ERROR_MAXLEN+ENC_PAD)+")") | @Type(type=ENCRYPTED_STRING) @Column(updatable=false, columnDefinition="varchar("+(ERROR_MAXLEN+ENC_PAD)+")") | ||||
@Getter private String error; | @Getter private String error; | ||||
public BubbleBackup setError (String err) { this.error = ellipsis(err, ERROR_MAXLEN); return this; } | |||||
public BubbleBackup setError (String err) { this.error = ellipsis(err, ERROR_MAX_BEFORE_ELLIPSES); return this; } | |||||
public boolean hasError () { return !empty(error); } | public boolean hasError () { return !empty(error); } | ||||
public boolean canDelete() { return status.isDeletable() || getCtimeAge() > BR_STATE_LOCK_TIMEOUT; } | public boolean canDelete() { return status.isDeletable() || getCtimeAge() > BR_STATE_LOCK_TIMEOUT; } | ||||
@@ -23,8 +23,7 @@ import org.hibernate.annotations.Type; | |||||
import javax.persistence.*; | import javax.persistence.*; | ||||
import static bubble.ApiConstants.DB_JSON_MAPPER; | |||||
import static bubble.ApiConstants.ERROR_MAXLEN; | |||||
import static bubble.ApiConstants.*; | |||||
import static org.cobbzilla.util.daemon.ZillaRuntime.bool; | import static org.cobbzilla.util.daemon.ZillaRuntime.bool; | ||||
import static org.cobbzilla.util.daemon.ZillaRuntime.errorString; | import static org.cobbzilla.util.daemon.ZillaRuntime.errorString; | ||||
import static org.cobbzilla.util.json.JsonUtil.json; | import static org.cobbzilla.util.json.JsonUtil.json; | ||||
@@ -91,7 +90,7 @@ public class NotificationBase extends IdentifiableBase implements HasAccountNoNa | |||||
@ECSearchable(filter=true) @ECField(index=100) | @ECSearchable(filter=true) @ECField(index=100) | ||||
@Type(type=ENCRYPTED_STRING) @Column(updatable=false, columnDefinition="varchar("+(ERROR_MAXLEN+ENC_PAD)+")") | @Type(type=ENCRYPTED_STRING) @Column(updatable=false, columnDefinition="varchar("+(ERROR_MAXLEN+ENC_PAD)+")") | ||||
@JsonIgnore @Getter private String error; | @JsonIgnore @Getter private String error; | ||||
public NotificationBase setError (String err) { this.error = ellipsis(err, ERROR_MAXLEN); return this; } | |||||
public NotificationBase setError (String err) { this.error = ellipsis(err, ERROR_MAX_BEFORE_ELLIPSES); return this; } | |||||
public void setException(Exception e) { setError(errorString(e, ERROR_MAXLEN)); } | public void setException(Exception e) { setError(errorString(e, ERROR_MAXLEN)); } | ||||
} | } |
@@ -1 +1 @@ | |||||
bubble.version=Adventure 1.4.29 | |||||
bubble.version=Adventure 1.4.30 |
@@ -0,0 +1,3 @@ | |||||
ALTER TABLE received_notification ALTER COLUMN error TYPE VARCHAR(20100); | |||||
ALTER TABLE sent_notification ALTER COLUMN error TYPE VARCHAR(20100); | |||||
ALTER TABLE bubble_backup ALTER COLUMN error TYPE VARCHAR(20100); |