Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pi-hole FTL v2.13 #173

Merged
merged 25 commits into from
Dec 22, 2017
Merged

Pi-hole FTL v2.13 #173

merged 25 commits into from
Dec 22, 2017

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Dec 16, 2017

Release

DL6ER and others added 23 commits November 29, 2017 19:14
@DL6ER
Make path and file name of FTL's long-term database adjustable via th…
dde29d1 
…e config file

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Disable FTL's database functionality on all errors (except DATABASE B…
ac0c98d 
…USY)

Signed-off-by: DL6ER <[email protected]>
@DL6ER
SQLITE_OK, SQLITE_DONE, and SQLITE_ROW are success codes, i.e. …
8124cf2 
…they should not lead to disabling of the database

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Merge pull request #166 from pi-hole/tweak/disable_db_on_unknown_error
e3a63d3 
Disable FTL's DB functionality on errors
@DL6ER
Tweaks for Travis automated testing
4da545e 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Explicitly specify where conf file is to be found on Travis build sys…
f184510 
…tems

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Check if version is of format vX.YYY or vXX.YYY to decide whether on …
32c2471 
…a deployed version or not

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Add Readme details
332731b 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Some more details for the README
9c89d70 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Add another comment to clarify what sscanf() is doing here
9c7bac7 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Use a better detection for '.' in the version string / commit hash
c9d990f 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Merge pull request #168 from pi-hole/tweak/versiondisplay_travis
888bda2 
Improve version display
@DL6ER
Don't use to lower case converted domain when determining status (OK,…
4bc4b64 
… Pi-holed, ...)

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Adjust test to include a mixed domain
7925a77 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Another modifications to the changed test
49b229e 
Signed-off-by: DL6ER <[email protected]>
@AzureMarker
Merge pull request #171 from pi-hole/fix/domains_mixed_case
434d6b7 
Don't use to lower case converted domain when determining status (OK, Pi-holed, ...)
@AzureMarker
Merge pull request #167 from pi-hole/new/variablefilenames
95bdd62 
Make long-term database location adjustable
@DL6ER
Make interval in which FTL stores queries in the long term database e…
06b9e02 
…asily adjustable via the config file.

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Merge branch 'development' into new/DBinterval
59edb2a 
Signed-off-by: DL6ER <[email protected]>

Conflicts:
	README.md
	config.c
@DL6ER
Maximum should be one day
05afda1 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Default should be once per minute
effca04 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Ensure that data is also written to the DB when DB garbage collection…
5951e5b 
… is done (but before). This ensures that the queries will be written to the database even if the user specifies DBINTERVAL=n*60 (where n=1,2,3,...) which is a special that was not explicitly considered so far.

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Merge pull request #172 from pi-hole/new/DBinterval
8ab56e5 
Make DB interval adjustable
@DL6ER DL6ER added the Release label Dec 16, 2017
@DL6ER DL6ER added this to the v2.13 milestone Dec 16, 2017
@DL6ER DL6ER requested a review from a team December 16, 2017 08:54
@DL6ER DL6ER changed the title Pi-hole FTL v2.13 [WIP] Pi-hole FTL v2.13 Dec 16, 2017
AzureMarker
AzureMarker previously approved these changes Dec 19, 2017
View reviewed changes
@DL6ER DL6ER changed the title [WIP] Pi-hole FTL v2.13 Pi-hole FTL v2.13 Dec 21, 2017
DL6ER
DL6ER commented Dec 21, 2017
View reviewed changes
Copy link
Member Author

@DL6ER DL6ER left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved.

@jacobsalmela jacobsalmela merged commit 07b1275 into master Dec 22, 2017
@DL6ER DL6ER deleted the release/v2.13 branch December 22, 2017 21:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jacobsalmela jacobsalmela jacobsalmela approved these changes

@AzureMarker AzureMarker AzureMarker approved these changes

Assignees
No one assigned
Labels
Release
Projects
None yet
Milestone
v2.13
Development

Successfully merging this pull request may close these issues.
3 participants
@DL6ER @jacobsalmela @AzureMarker